28302 Commits

Author SHA1 Message Date
Claire
ae1defcfd1
Merge pull request #3451 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to cffa8de6267a57673b7f6264fab671153f965d23
2026-03-19 18:14:15 +01:00
Echo
d6aee5b21f [Glitch] Refactor: Relative timestamp component
Port cffa8de6267a57673b7f6264fab671153f965d23 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-19 12:44:07 +01:00
Echo
f2d834c852 [Glitch] Profile redesign: Adjust account number fields to be stacked
Port 2af5c8551dce440b3bc297951ef6095c9df1577b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-19 12:40:08 +01:00
diondiondion
4759142f0e [Glitch] Sign-up server rules: Show different icon on toggle button when description is expanded
Port 43d66959aaef15b2ef26e9fa41e644cbddf89f2a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-19 12:39:41 +01:00
Claire
fac3080289 Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream 2026-03-19 12:38:31 +01:00
Claire
7d827f1db1
Merge pull request #3450 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to db074fc3e2b671e28a44ae379e6df1fcbdbbce53
2026-03-19 12:37:19 +01:00
Echo
cffa8de626
Refactor: Relative timestamp component (#38275) 2026-03-19 11:15:23 +00:00
Echo
2af5c8551d
Profile redesign: Adjust account number fields to be stacked (#38283) 2026-03-19 11:04:15 +00:00
diondiondion
43d66959aa
Sign-up server rules: Show different icon on toggle button when description is expanded (#38293) 2026-03-19 10:58:59 +00:00
Matt Jankowski
2ce4529e1e
Final backup service prep for JSON cleanup (#38284) 2026-03-19 10:20:42 +00:00
renovate[bot]
d4c7ac5cd5
Update opentelemetry-ruby (non-major) (#38273)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-19 10:14:39 +00:00
renovate[bot]
8c6fdad0ca
Update dependency capybara-playwright-driver to v0.5.9 (#38269)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-19 10:12:30 +00:00
renovate[bot]
f5aa8e1b25
Update dependency webmock to v3.26.2 (#38270)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-19 10:12:26 +00:00
renovate[bot]
71e92ca32a
Update dependency libvips to v8.18.1 (#38276)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-03-19 09:43:56 +00:00
github-actions[bot]
6aedd2f9ec
New Crowdin Translations (automated) (#38288)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-19 09:30:49 +00:00
diondiondion
ec940e88df
Add missing h1 headings to Reset Password & Resend Confirmation Link pages (#38285) 2026-03-19 08:26:52 +00:00
Claire
d9dbe62417
Fix error when processing Add activity where the target is embedded and not a special collection (#38282) 2026-03-19 08:13:50 +00:00
diondiondion
f4c696af13 [Glitch] Improve accessibility of server rules list in sign-up flow
Port 380b898d0d90da1d73db776243a24f0f4ac2a654 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-18 18:09:16 +01:00
Claire
842bac86f6 Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream 2026-03-18 18:01:57 +01:00
Claire
84c741475e
Merge pull request #3449 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to d52d0e4dedcc4c8ca12781681debe68f77c007e2
2026-03-18 18:01:10 +01:00
Matt Jankowski
db074fc3e2
Add constant for backup service placeholder (#38280) 2026-03-18 16:22:24 +00:00
diondiondion
380b898d0d
Improve accessibility of server rules list in sign-up flow (#38257) 2026-03-18 16:08:23 +00:00
Matt Jankowski
815c2cf8e9
Clean up Webfinger lib spec (#38259) 2026-03-18 13:23:06 +00:00
Matt Jankowski
bd9b24f1ef
Prefer rspec-sidekiq matchers over "expect push bulk to match" approach (#38274) 2026-03-18 13:21:54 +00:00
Matt Jankowski
e537292e2a
Prefer to_json in self destruct scheduler (#38263) 2026-03-18 13:21:03 +00:00
Claire
c0a8442fd5 Fix stray use of Oj gem in glitch-soc-only migrations 2026-03-18 12:14:54 +01:00
diondiondion
3d913d2bf1 [Glitch] Remove superfluous SCSS imports file
Port 11112fa9dcacf54d4c790bbb0bc302d2209b57bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-18 12:03:47 +01:00
Claire
b305b3b2db Fix stray glitch-soc-only use of Oj gem 2026-03-18 12:02:13 +01:00
Claire
2b0531914f Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream 2026-03-18 12:01:23 +01:00
Claire
d52d0e4ded
Update dependency action_text-trix (#38271) 2026-03-18 10:11:05 +00:00
Matt Jankowski
b497bb2908
Normalize current_username on account redirect form (#38262) 2026-03-18 09:33:00 +00:00
github-actions[bot]
5e7f221cab
New Crowdin Translations (automated) (#38267)
Co-authored-by: GitHub Actions <noreply@github.com>
2026-03-18 09:17:33 +00:00
Matt Jankowski
e839a94b93
Use with_index iterator in backup service (#38264) 2026-03-18 09:11:14 +00:00
Nicholas La Roux
36400681cf
Remove oj and its initializer and add json to the Gemfile (#37752) 2026-03-18 09:02:11 +00:00
Claire
5a1e9a6f5e
Merge pull request #3448 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to b320c9e4c901bf99ccbca321bad2ceb2f51de140
2026-03-17 20:34:40 +01:00
Itoh Shimon
984e9f4e83 [Glitch] Fix vertically written textareas
Port efa76ace8a9d0bfd125340420f22c6d8fbcd688d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-17 18:59:21 +01:00
diondiondion
a6a013c21b [Glitch] Improve accessibility of sign-up progress indicator
Port 75c4ff35d287e85e52fa162ca3d293bcc8b50be0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-17 18:59:01 +01:00
Claire
3593ddff11 Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream 2026-03-17 18:58:19 +01:00
diondiondion
5b9cb55701 [Glitch] Revamp heading levels in settings & admin pages
Port 68984de5b503791b814d81a85520af256bf43e11 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2026-03-17 18:55:35 +01:00
Claire
bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.
2026-03-17 18:53:00 +01:00
Claire
348a7a628f
Merge pull request #3447 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to c37bc5a8a94758e19b2d50db5e7816a96cec5cf4
2026-03-17 18:50:00 +01:00
diondiondion
11112fa9dc
Remove superfluous SCSS imports file (#38261) 2026-03-17 17:39:21 +00:00
Claire
04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
Claire
dfccf6423c
Merge pull request #3445 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 16c41e035bdd6e08927c950aeeb5332adbe8b6d5
2026-03-17 18:00:23 +01:00
Matt Jankowski
b320c9e4c9
Prefer to_json over JSON.generate when simple strings in stub request (#38258) 2026-03-17 16:10:54 +00:00
David Roetzel
f3035a8e51
Handle Reject of a FeatureRequest (#38256) 2026-03-17 15:59:51 +00:00
Matt Jankowski
90840b3ede
Rename deprecated ffmpeg vsync arg to fps_mode (#38198) 2026-03-17 15:44:50 +00:00
Itoh Shimon
efa76ace8a
Fix vertically written textareas (#38205) 2026-03-17 15:43:49 +00:00
Matt Jankowski
9c4a072adf
Add missing require rails helper to recent moved files (#38254) 2026-03-17 15:16:32 +00:00
David Roetzel
96c93ba835
Only persist a collection item's approval URI once it is verified (#38255) 2026-03-17 15:14:30 +00:00