Claire
aec61a703f
Merge branch 'main' into glitch-soc/merge-upstream ...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how docker images were built, including how
they were cached.
I don't know much about it, so applied upstream's changes.
- `app/controllers/admin/domain_blocks_controller.rb`:
The feature, that was in glitch-soc, got backported upstream.
It also had a few fixes upstream, so those have been ported!
- `app/javascript/packs/admin.js`:
Glitch-soc changes have been backported upstream. As a result,
some code from `app/javascript/core/admin.js` got added upstream.
Kept our version since our shared Javascript already has that feature.
- `app/models/user.rb`:
Upstream added something to distinguish unusable and unusable-because-moved
accounts, while glitch-soc considers moved accounts usable.
Took upstream's code for `functional_or_moved?` and made `functional?`
call it.
- `app/views/statuses/_simple_status.html.haml`:
Upstream cleaned up code style a bit, on a line that we had custom changes
for.
Applied upstream's change while keeping our change.
- `config/initializers/content_security_policy.rb`:
Upstream adopted one CSP directive we already had.
The conflict is because of our files being structurally different, but the
change itself was already part of glitch-soc.
Kept our version.
2022-11-17 12:01:37 +01:00
2022-03-17 19:23:39 +01:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-17 10:53:38 +01:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 13:28:03 +01:00
2022-11-15 14:37:37 +09:00
2022-11-14 01:14:31 +09:00
2022-11-12 15:56:25 +09:00
2022-11-14 01:14:31 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-14 01:14:31 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-14 01:14:31 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-14 08:35:55 +01:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-14 01:14:31 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-14 01:14:31 +09:00
2022-11-14 01:14:31 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-14 08:35:55 +01:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-14 01:14:31 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2022-11-14 01:14:31 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-15 14:37:37 +09:00
2021-04-22 00:04:58 +02:00
2018-07-24 20:47:13 +02:00
2019-03-24 18:44:59 +01:00
2019-09-16 15:11:01 +02:00
2022-03-17 09:33:25 +09:00
2018-07-11 01:14:38 +02:00
2018-08-31 04:28:29 +02:00
2018-07-11 01:14:38 +02:00
2022-11-12 15:56:25 +09:00
2022-05-06 21:53:22 +09:00
2019-09-29 17:10:01 +02:00
2021-05-08 17:12:56 +02:00
2019-08-17 22:02:37 +02:00
2022-06-04 13:44:49 +09:00
2019-09-20 23:05:23 +02:00
2021-04-22 00:04:58 +02:00
2019-04-21 04:52:20 +02:00
2022-11-01 18:42:04 +09:00
2020-01-12 15:18:03 +01:00
2018-08-18 01:00:01 +09:00
2020-01-12 15:18:03 +01:00
2019-02-23 18:41:28 +01:00
2019-11-13 23:24:55 +01:00
2020-07-10 20:57:21 +02:00
2021-04-22 00:04:58 +02:00
2019-06-12 15:56:18 +02:00
2019-01-08 14:09:57 +01:00
2019-10-03 03:36:52 +02:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2018-12-22 23:32:00 +01:00
2022-11-01 18:42:04 +09:00
2019-09-16 15:11:01 +02:00
2021-04-22 00:04:58 +02:00
2019-09-16 15:11:01 +02:00
2018-09-02 03:14:46 +02:00
2020-11-09 00:56:52 +01:00
2020-05-13 22:35:20 +02:00
2021-04-22 00:04:58 +02:00
2019-02-11 07:41:35 +01:00
2020-07-02 00:45:15 +02:00
2018-09-02 18:20:26 +02:00
2020-07-02 00:45:15 +02:00
2020-12-16 03:24:55 +01:00
2020-07-10 20:57:21 +02:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2020-11-09 00:56:52 +01:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
2022-11-12 15:56:25 +09:00
aec61a703f