Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge v4.2.1 #1937

Closed
wants to merge 1,651 commits into from
Closed

Merge v4.2.1 #1937

wants to merge 1,651 commits into from

Conversation

rosylilly
Copy link
Member

No description provided.

ClearlyClaire and others added 30 commits August 23, 2023 15:44
@ClearlyClaire
Change hashtag bar tags to be de-emphasized (mastodon#26606)
613cfd6
@renovate
Update dependency immutable to v4.3.3 (mastodon#26622)
de8c242 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency oj to v3.16.0 (mastodon#26520)
060b554 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sass to v1.66.1 (mastodon#26534)
34f5b90 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@jsgoldstein
Add elastic search installation into Vagrantfile (mastodon#26512)
b91724f
@danielmbrasil
Fix timeout on invalid set of exclusionary parameters in `/api/v1/tim…
f337008 
…elines/public` (mastodon#26239)
@AntoninDelFabbro
Change opacity of the delete icon in the search field to be more visi…
9a8190d 
…ble (mastodon#26449)
@renovate
Update dependency rspec-sidekiq to v4 (mastodon#26627)
e3fd071 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Consolidate inclusion of admin js pack link (mastodon#26628)
9974163
@renovate
Update dependency redis to v4.6.8 (mastodon#26630)
24ea6f8 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@sinoru @ClearlyClaire
Fix: Workaround to load MASTODON_VERSION_* in Docker. (mastodon#26591)
2dbbeed 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Fix selecting domains to forward reports to not passing the informati…
b2ac93d 
…on correctly (mastodon#26636)
@ClearlyClaire @Plastikmensch
Fix clicking “Explore” or “Live feeds” column headers to scroll in ad…
e90649b 
…vanced mode (mastodon#26633)

Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
@ClearlyClaire
Change admin e-mail notification settins to be their own settings gro…
163b004 
…up (mastodon#26596)
@ClearlyClaire
Change nightlies versioning from v4.2.0+2023-08-23 to `v4.2.0-night…
96bcee6 
…ly.2023-08-23` (mastodon#26626)
@jsgoldstein @Gargron @ClearlyClaire
Add new public status index (mastodon#26344)
30c191a 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Fix changelog wording and missing items (mastodon#26638)
389b7d2
@renovate
Update babel monorepo to v7.22.11 (mastodon#26640)
c66f756 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Add data-nosnippet attribute to remote posts and local posts with `…
c3a42e1 
…noindex` (mastodon#26648)
@ClearlyClaire
Add PublicStatusesCheck to Elasticsearch index check on admin dashboa…
e3825a1 
…rd (mastodon#26650)
@ClearlyClaire
Add Elasticsearch/OpenSearch version to “Software” in admin dashboard (…
f2ec287 
…mastodon#26652)
@ClearlyClaire
Fix statuses search Elasticsearch query (mastodon#26657)
82ec6f1
@renovate
Update dependency immutable to v4.3.4 (mastodon#26655)
e4c0ce1 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@jsgoldstein
Update ordering to use id from body of document instead of deprecat…
8e8747c 
…ed `_id` (mastodon#26659)
@ClearlyClaire
Fix dashboard check for Elasticsearch suggested command including inc…
0721128 
…orrect names (mastodon#26658)
@ClearlyClaire
Change the pre-release versioning scheme and associated environment v…
f398474 
…ariables (mastodon#26653)
@Gargron
Fix toast saying "published" instead of "saved" after editing post in…
7164176 
… web UI (mastodon#26664)
@ClearlyClaire
Fix nightly build version (mastodon#26676)
925c16a
@Gargron
Change queue of job when opting into search from default to pull (m…
f8d2fea 
…astodon#26688)
@Gargron
Fix unnecessary condition causing seqscan when indexing (mastodon#26689)
5694e24
ClearlyClaire and others added 26 commits October 10, 2023 13:52
@ClearlyClaire
Fix incorrectly keeping outdated update notices absent from the API e…
8a6fa34 
…ndpoint (mastodon#27021)
@ClearlyClaire
Change some worker lock TTLs (mastodon#27246)
6ba4b20
@github-actions @web-flow @ClearlyClaire
New Crowdin Translations (automated) (mastodon#27260)
7c6f410 
Co-authored-by: GitHub Actions <noreply@github.com>
@jgillich @ClearlyClaire
Fix importer returning negative row estimates (mastodon#27258)
16dcdfc
@suddjian @ClearlyClaire
Change min age of backup policy from 1 week to 6 days (mastodon#27200)
82502f5
@vmstan @ClearlyClaire
Keep version string displayed without breakpoints in UI (mastodon#26986)
aa4c4f5
@ClearlyClaire
Add a short-lived lock to trend refresh scheduler (mastodon#27253)
451884a
@ClearlyClaire
Fix boosts of local users being filtered in account timelines (mastod…
0619ec1 
…on#27204)
@ClearlyClaire
Fix double scroll bars in some columns in advanced interface (mastodo…
3e21780 
…n#27187)
@mjankowski @ClearlyClaire
Dont match mention in url query string (mastodon#25656)
a958806 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@ClearlyClaire
Fix Vary headers not being set on some redirects (mastodon#27272)
ffcf2c6
@github-actions @web-flow @ClearlyClaire
New Crowdin Translations (automated) (mastodon#27270)
aba0c5a 
Co-authored-by: GitHub Actions <noreply@github.com>
@github-actions @web-flow @ClearlyClaire
New Crowdin Translations (automated) (mastodon#27277)
88fc73d 
Co-authored-by: GitHub Actions <noreply@github.com>
@ClearlyClaire
Fix auto-loading-more when not scrolled (mastodon#27286)
b9b8eaf
@renovate @ClearlyClaire
Update dependency sidekiq to v6.5.10 (mastodon#27287)
f4b0a10 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow @ClearlyClaire
New Crowdin Translations (automated) (mastodon#27304)
2e2936e 
Co-authored-by: GitHub Actions <noreply@github.com>
@ClearlyClaire
Fix some remote posts getting truncated (mastodon#27307)
f71b794
@andypiper @ClearlyClaire
Add 4.2.x to supported versions in SECURITY.md (mastodon#27317)
8f55224
@github-actions @web-flow @ClearlyClaire
New Crowdin Translations (automated) (mastodon#27321)
5a33b81 
Co-authored-by: GitHub Actions <noreply@github.com>
@ClearlyClaire
Fix clicking on already-opened thread post scrolling to the top of th…
6dcccd3 
…e thread (mastodon#27331)
@ClearlyClaire
Fix clicking on already-loaded thread scrolling to the top of the thr…
bcfc3b3 
…ead (mastodon#27338)
@github-actions @web-flow @ClearlyClaire
New Crowdin Translations (automated) (mastodon#27347)
4262cfb 
Co-authored-by: GitHub Actions <noreply@github.com>
@ClearlyClaire
Fix scroll position in thread view reseting when closing a modal (mas…
a1f7d2d 
…todon#27350)
@ClearlyClaire
Bump version to v4.2.1
790fd13
@ClearlyClaire
Fix duplicate reports being sent when reporting some remote posts (po…
74dd325 
…rt to v4.2.1) (mastodon#27356)
@rosylilly
Merge tag 'v4.2.1' into merge-v4.2.1
d61f6b7
@github-actions GitHub Actions
Copy link

This pull request has merge conflicts that must be resolved before it can be merged.

@rosylilly rosylilly closed this Feb 16, 2024
@rosylilly rosylilly deleted the merge-v4.2.1 branch February 16, 2024 02:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rebase needed 🚧
Projects
None yet
Milestone
No milestone