Claire
e08c8b6933
Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/settings_helper.rb`:
Upstream added a new helper.
Conflict caused by the fact there is a glitch-soc specific helper.
Added upstream's new helper in addition to glitch-soc's.
2026-06-09 21:30:54 +02:00
Matt Jankowski
fef5a501cc
Add coverage for rules acceptance and invite code handling ( #39310 )
2026-06-09 09:54:38 +00:00
Matt Jankowski
bc7e0543a3
Add coverage for email subscription account controls ( #39333 )
2026-06-08 15:04:02 +00:00
Claire
c2e6cbb12b
Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream
2026-06-07 14:29:57 +02:00
Matt Jankowski
4957a4fb50
Exercise ip block comment path in admin area ( #39292 )
2026-06-05 07:54:34 +00:00
Matt Jankowski
ada6e1339d
Exercise more of disputes/strikes/_card partial ( #39265 )
2026-06-04 14:45:14 +00:00
Claire
a1ab96baed
Merge commit '52aa8a44bbd0c9a6673cbd9b7c088020be938799' into glitch-soc/merge-upstream
2026-06-03 22:30:16 +02:00
Matt Jankowski
65622a52e1
Exercise more of rule_translations/_rule_translation partial ( #39266 )
2026-06-03 13:22:01 +00:00
Claire
06176deee2
Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream
2026-05-26 20:48:49 +02:00
diondiondion
e1aa4e3a8c
Accessibility: Add landmark regions to Web UI ( #39133 )
2026-05-26 10:22:22 +00:00
Claire
49310aeecf
Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream
2026-05-06 21:00:32 +02:00
Pia B.
1a2038775c
Add ability to search email blocks by domain ( #38923 )
2026-05-06 15:54:12 +00:00
Matt Jankowski
d243ba36ce
Add admin area spec for email subscriptions management ( #38912 )
2026-05-06 08:47:12 +00:00
Matt Jankowski
aee0025ca3
Add system spec for managing everyone user role 2FA ( #38911 )
2026-05-06 08:36:42 +00:00
Claire
6935fce458
Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream
2026-05-04 21:08:25 +02:00
Matt Jankowski
696aaa616b
Update rubocop-capybara to version 2.23.0 ( #38868 )
2026-05-04 07:52:29 +00:00
Claire
b9014ec220
Merge commit '66fdd3ae65e13349fbc0b2818d4b91a389075553' into glitch-soc/main
2026-04-08 19:32:32 +02:00
Claire
69b70d48c6
Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream
2026-04-07 20:08:57 +02:00
Echo
e4e7e679b3
Profile editing: Removes old profile editing page ( #38584 )
2026-04-07 13:52:04 +00:00
Matt Jankowski
71e6e50846
Simplify media attachment lookup in show/player actions ( #38565 )
2026-04-07 09:58:37 +00:00
Claire
da85a16692
Merge commit '8fa91b4b81951f884a773d0aa56fc4f1a48da03e' into glitch-soc/merge-upstream
2026-04-04 09:31:50 +02:00
Matt Jankowski
ee69290003
Use collection partial for "software updates" list in admin area ( #38550 )
2026-04-03 13:28:50 +00:00
Claire
7a4747122e
Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream
...
- `CODE_OF_CONDUCT.md`:
Adopt upstream's new Code of Conduct
2026-04-01 19:11:21 +02:00
Echo
ca5c0a144a
Profile redesign: Remove feature flag ( #38513 )
2026-04-01 15:03:43 +00:00
Claire
469076c357
Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream
2026-03-20 18:03:14 +01:00
Claire
8f9eba9629
Add more tests around terminating streaming connections ( #38301 )
2026-03-20 10:00:30 +00:00
Claire
2b0531914f
Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream
2026-03-18 12:01:23 +01:00
Matt Jankowski
b497bb2908
Normalize current_username on account redirect form ( #38262 )
2026-03-18 09:33:00 +00: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
diondiondion
68984de5b5
Revamp heading levels in settings & admin pages ( #38230 )
2026-03-17 10:32:24 +00:00
Claire
73f77c49d8
Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
Bumped the Mastodon API version as upstream did.
2026-03-16 18:16:56 +01:00
Matt Jankowski
1a464bc5ed
Use to_json in simple view hash data-props build locations ( #38218 )
2026-03-16 14:02:52 +00:00
Claire
3afb58ad18
Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream
2026-03-14 11:41:24 +01:00
Matt Jankowski
6416724f75
Normalize current_username on account migration ( #38183 )
2026-03-13 09:33:02 +00:00
Claire
0a989af8c6
Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream
2026-03-05 18:21:07 +01:00
Matt Jankowski
4e3866dbaf
Replace email_spec gem with built-in matchers ( #38079 )
2026-03-05 14:42:21 +00:00
Claire
b041869887
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
Nicholas La Roux
438602c488
Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences ( #37795 )
2026-02-17 14:56:46 +00:00
Claire
f47e2937cf
Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream
2026-02-17 12:11:33 +01:00
Matt Jankowski
2cb8471d81
Update doorkeeper i18n for invalid code challenge method ( #37827 )
2026-02-17 09:01:59 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
Claire
dfe44bcaef
Add ability to require 2FA for specific roles (including Everybody) ( #37701 )
2026-02-11 14:34:09 +00:00
Claire
4fbd1ad7ae
Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream
...
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.
They were all manually resolved by adapting the relevant code.
2026-02-11 13:32:18 +01:00
Claire
75ba314e6b
Migrate to new theming infrastructure ( #37612 )
2026-02-10 10:59:47 +00:00
Claire
59e02a628d
Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/backup_service.rb`:
Upstream refactored activity serialization while glitch-soc passed an extra argument.
Followed upstream's refactor, keeping our extra argument.
2026-02-05 12:43:12 +01:00
Matt Jankowski
f652c54c33
Update devise to version 5.0 ( #37419 )
2026-02-05 11:05:32 +00:00
Matt Jankowski
e82eb2b037
Convert admin/confirmations spec controller->request/system ( #37738 )
2026-02-05 10:04:10 +00:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Matt Jankowski
634ff77d82
Convert settings/aliases spec controller->system ( #37617 )
2026-01-27 10:18:07 +00:00
Claire
3e4cd799fd
Merge commit '7e634eecbc5dc2f65b7bdbfc5c2b5c8a0955156d' into glitch-soc/merge-upstream
2026-01-06 18:11:26 +01:00
