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 upstream changes (stable-4.3) #2865

Merged
merged 52 commits into from
Oct 6, 2024
Merged

Merge upstream changes (stable-4.3) #2865

merged 52 commits into from
Oct 6, 2024

Conversation

ClearlyClaire
Copy link

Conflicts

  • app/helpers/application_helper.rb:
    Upstream added a helper where glitch-soc had its own, not really a conflict.
    Added upstream's helper.

Ported changes

mjankowski and others added 30 commits October 4, 2024 17:48
@mjankowski @ClearlyClaire
Use account display name for pretend blog example in attribution area (…
1b3472b 
…mastodon#32188)
@renchap @ClearlyClaire
Fix follow notifications from streaming being grouped (mastodon#32179)
8ac0053
@mjankowski @ClearlyClaire
Avoid id duplication conflict with main navigation from settings pr…
1283c35 
…ofile link (mastodon#32181)
@renovate @ClearlyClaire
Update peter-evans/create-pull-request action to v7.0.5 (mastodon#32164)
6398d7b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski @ClearlyClaire
Extract dashboard partial for admin instance page (mastodon#32189)
6734b65
@mjankowski @ClearlyClaire
Improve alignment of icons on admin roles list (mastodon#32153)
c828e77
@renovate @ClearlyClaire
Update dependency propshaft to v1.1.0 (mastodon#32192)
25e8a6e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate @ClearlyClaire
Update dependency webmock to v3.24.0 (mastodon#32190)
e13453a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski @ClearlyClaire
Add date_range view helper (mastodon#32187)
bdceb1d
@renovate @ClearlyClaire
Update RuboCop (non-major) to v1.22.1 (mastodon#31573)
efa74a6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@oneiros @ClearlyClaire
Move OTP secret length to configuration (mastodon#32125)
ce2481a
@mjankowski @ClearlyClaire
Remove WebfingerHelper module & move usage inline (mastodon#31203)
66ef4b9
@mjankowski @ClearlyClaire
Use module: :users in routes/admin section (mastodon#30767)
4ad1e95
@renovate @ClearlyClaire
Update dependency postcss-preset-env to v10.0.5 (mastodon#32019)
a473988 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski @ClearlyClaire
Remove explicit put action in settings forms (mastodon#32176)
53624b1
@mjankowski @ClearlyClaire
Fix nav item active highlight for some paths (mastodon#32159)
f517f0d
@mjankowski @ClearlyClaire
Only show email domain blocks MX table when some found (mastodon#32155)
4e6f13a
@mjankowski @ClearlyClaire
Extract constants for header and avatar geometry (mastodon#32151)
1e19242
@mjankowski @ClearlyClaire
Wrap datetime in time element with attrs (mastodon#32177)
97db4bd
@ThisIsMissEm @ClearlyClaire
Add detection and download of material_symbol icons in config/navigat…
f397550 
…ion.rb (mastodon#31366)
@ClearlyClaire
Fix unneeded requests to blocked domains when receiving relayed signe…
754b03d 
…d activities from them (mastodon#31161)
@mjankowski @ClearlyClaire
Fix broken border on applications list (mastodon#32147)
784d1bf
@mjankowski @ClearlyClaire
Adjust spacing on setting sub-nav items when below mobile size (masto…
09cf617 
…don#32137)
@mjankowski @ClearlyClaire
Avoid repeated icon stack in settings sidebar (mastodon#32201)
19d1392
@tribela @ClearlyClaire
Show timestamp when the user deletes their account on admin dashboard (…
b2ce9bb 
…mastodon#25640)

Co-authored-by: Claire <[email protected]>
@mjankowski @ClearlyClaire
Fix Rails/CreateTableWithTimestamps cop (mastodon#30836)
c91e06b
@tribela @ClearlyClaire
Ignore error if mentioned account was not processable (mastodon#29215)
b8fdffe 
Co-authored-by: Claire <[email protected]>
@c960657 @ClearlyClaire
Support /.well-known/host-meta.json (mastodon#32206)
cbf1349
@mjankowski @ClearlyClaire
Expand coverage for Export utility class (mastodon#32212)
243a85e
@ClearlyClaire
Fix incorrect 'navigator' check (mastodon#32219)
9315538
mjankowski and others added 22 commits October 4, 2024 17:48
@mjankowski @ClearlyClaire
Extract WebPushRequest from push notification worker and subscripti…
f07707a 
…on (mastodon#32208)
@mjankowski @ClearlyClaire
Remove unneeded reorder(nil) conditions (mastodon#32200)
74291df
@mjankowski @ClearlyClaire
Add relevant_params to ReportFilter (matches account filter) (masto…
7de8d5f 
…don#32136)
@mjankowski @ClearlyClaire
Provide use_path to qr generator for svg data size reduction (masto…
ceba0f0 
…don#32127)
@ClearlyClaire
Fix media uploads in composer appearing over search results in advanc…
4a2d392 
…ed interface (mastodon#32217)
@ClearlyClaire
Fix editing description of media uploads with custom thumbnails (mast…
404f467 
…odon#32221)
@mjankowski @ClearlyClaire
Enable hostname config for all system specs (mastodon#32109)
aa46348
@mjankowski @ClearlyClaire
Clean up labels on development application form (mastodon#32116)
5c72b46
@mjankowski @ClearlyClaire
Add copyable_input helper method to wrap shared options (mastodon#3…
d82ffdc 
…2119)
@mjankowski @ClearlyClaire
Move admin action log type list generation to helper (mastodon#32178)
2e8b752
@ClearlyClaire
Hide badges in media gallery when media are hidden (mastodon#32224)
55b5364
@ClearlyClaire
Fix Content-Security-Policy when using sso-redirect (mastodon#32241)
81cd489
@ClearlyClaire
Fix unsupported grouped notifications from streaming causing duplicat…
6d5aa58 
…e IDs (mastodon#32243)
@ClearlyClaire
Merge branch 'stable-4.3' into glitch-soc/backports-4.3
dfe851b 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
@renchap @ClearlyClaire
[Glitch] Fix follow notifications from streaming being grouped
1b6bd58 
Port 8ac0053 to glitch-soc

Signed-off-by: Claire <[email protected]>
@mjankowski @ClearlyClaire
[Glitch] Improve alignment of icons on admin roles list
69c76fd 
Port c828e77 to glitch-soc

Signed-off-by: Claire <[email protected]>
@mjankowski @ClearlyClaire
[Glitch] Adjust spacing on setting sub-nav items when below mobile size
e58d99a 
Port 09cf617 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix incorrect 'navigator' check
3cad509 
Port 9315538 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix media uploads in composer appearing over search results …
59a8066 
…in advanced interface

Port 4a2d392 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix editing description of media uploads with custom thumbnails
a09a26d 
Port 404f467 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Hide badges in media gallery when media are hidden
4d611e9 
Port 55b5364 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix unsupported grouped notifications from streaming causing…
354f549 
… duplicate IDs

Port 6d5aa58 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire marked this pull request as ready for review October 5, 2024 19:51
@ClearlyClaire ClearlyClaire merged commit 61e3e81 into glitch-soc:stable-4.3 Oct 6, 2024
35 checks passed
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ClearlyClaire @mjankowski @renchap @oneiros @ThisIsMissEm @tribela @c960657