chuckya/app/controllers/settings
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
..
exports Add import/export feature for bookmarks (#14956) 2020-11-19 17:48:13 +01:00
migration Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
preferences Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +02:00
two_factor_authentication Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
aliases_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
applications_controller.rb Change POST /settings/applications/:id to regenerate token on scopes change (#23359) 2023-02-02 12:03:49 +01:00
base_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-16 08:30:00 +01:00
deletes_controller.rb Remove setting that disables account deletes (#17683) 2022-10-06 10:16:47 +02:00
exports_controller.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
featured_tags_controller.rb Change featured hashtag deletion to be done synchronously (#19590) 2022-10-31 16:31:44 +01:00
flavours_controller.rb Revert some refactoring in order to make codebase closer to upstream 2019-07-23 10:51:12 +02:00
imports_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
login_activities_controller.rb Fix login date not showing up in login history by using “public” pack 2021-06-23 12:21:40 +02:00
migrations_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
pictures_controller.rb Fix profile update not being sent on profile/header picture deletion (#15461) 2020-12-30 23:19:18 +01:00
preferences_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-08-28 11:31:00 +02:00
profiles_controller.rb Add /api/v1/accounts/familiar_followers to REST API (#17700) 2022-03-07 09:36:47 +01:00
sessions_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
two_factor_authentication_methods_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00