Claire
3ef5f62abf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
..
2022-03-17 19:23:39 +01:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-28 23:01:05 +09:00
2023-02-22 21:16:02 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-04 15:46:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-04 15:46:08 +09:00
2023-03-15 09:16:10 +01:00
2023-02-11 05:42:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-22 21:16:02 +09:00
2023-02-28 23:01:05 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-16 10:23:03 +09:00
2023-02-22 21:16:02 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-28 23:01:05 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2017-11-20 22:13:37 -08:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-28 23:01:05 +09:00
2023-02-09 12:46:12 +01:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-28 23:01:05 +09:00
2023-02-04 15:46:08 +09:00
2023-02-28 23:01:05 +09:00
2023-02-04 15:46:08 +09:00
2023-02-11 05:42:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-09 12:46:12 +01:00
2023-02-16 10:23:03 +09:00
2023-02-07 02:41:31 +09:00
2023-02-16 10:23:03 +09:00
2023-02-22 21:16:02 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-16 10:23:03 +09:00
2023-02-07 02:41:31 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-28 23:01:05 +09:00
2023-02-11 05:42:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-22 21:16:02 +09:00
2023-02-07 02:41:31 +09:00
2023-02-28 23:01:05 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-04 15:46:08 +09:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2021-04-22 00:04:58 +02:00
2022-11-17 21:59:15 +09:00
2017-05-07 19:55:47 +02:00
2018-07-24 20:47:13 +02:00
2022-11-25 09:40:05 +09:00
2017-05-07 19:55:47 +02:00
2019-03-24 18:44:59 +01:00
2019-09-16 15:11:01 +02:00
2022-11-17 21:59:15 +09:00
2017-05-17 17:50:39 +02:00
2022-03-17 09:33:25 +09:00
2018-05-07 01:34:19 +02:00
2018-07-11 01:14:38 +02:00
2023-02-01 19:59:31 +09:00
2018-08-31 04:28:29 +02:00
2018-07-11 01:14:38 +02:00
2022-12-10 00:12:56 +09:00
2018-05-03 15:54:10 +02:00
2022-05-06 21:53:22 +09:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2019-09-29 17:10:01 +02:00
2021-05-08 17:12:56 +02:00
2017-05-07 19:55:47 +02:00
2019-08-17 22:02:37 +02:00
2018-05-03 15:54:10 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2022-11-17 21:59:15 +09:00
2022-11-17 21:59:15 +09:00
2017-05-07 19:55:47 +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
2017-12-09 15:35:22 +01:00
2017-05-07 19:55:47 +02:00
2019-04-21 04:52:20 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2018-01-22 14:20:58 +01:00
2017-05-07 19:55:47 +02:00
2022-11-01 18:42:04 +09:00
2017-05-07 19:55:47 +02:00
2020-01-12 15:18:03 +01:00
2017-05-07 19:55:47 +02:00
2017-06-13 03:55:28 +02: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
2017-07-04 16:11:23 +02:00
2020-07-10 20:57:21 +02:00
2021-04-22 00:04:58 +02:00
2022-12-16 12:46:39 +09: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
2017-05-07 19:55:47 +02:00
2019-09-16 15:11:01 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2021-04-22 00:04:58 +02:00
2017-05-07 19:55:47 +02:00
2017-05-07 19:55:47 +02:00
2019-09-16 15:11:01 +02:00
2018-09-02 03:14:46 +02:00
2017-05-07 19:55:47 +02:00
2020-11-09 00:56:52 +01:00
2020-05-13 22:35:20 +02:00
2022-11-17 21:59:15 +09:00
2021-04-22 00:04:58 +02:00
2018-01-03 21:00:39 +09:00
2018-05-10 14:48:26 +02:00
2019-02-11 07:41:35 +01:00
2018-01-05 04:43:50 +01:00
2018-01-03 21:00:39 +09:00
2017-11-25 03:39:57 +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
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2017-05-09 14:12:35 +02:00
2020-12-16 03:24:55 +01:00
2020-07-10 20:57:21 +02:00
2017-05-07 19:55:47 +02:00
2019-11-13 23:24:55 +01:00
2023-02-01 19:59:31 +09:00
2020-01-12 15:18:03 +01:00
2020-11-09 00:56:52 +01:00
2017-05-07 19:55:47 +02:00
2017-07-10 14:02:18 +02:00
2017-05-30 23:09:02 +02:00
2023-02-04 15:46:08 +09:00
2023-02-07 02:41:31 +09:00
2023-02-22 21:16:02 +09:00
2023-02-28 23:01:05 +09:00