luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 04:39:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/settings
History
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
exports
migration Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
preferences Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
two_factor_authentication Autofix Rubocop Rails/ResponseParsedBody (#24051) 2023-04-26 17:25:07 +02:00
aliases_controller_spec.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
applications_controller_spec.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
deletes_controller_spec.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
exports_controller_spec.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
featured_tags_controller_spec.rb Spec coverage on Settings/ controllers specs (#24221) 2023-04-11 11:35:39 +02:00
flavours_controller_spec.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
imports_controller_spec.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
login_activities_controller_spec.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
migrations_controller_spec.rb
pictures_controller_spec.rb Spec coverage on Settings/ controllers specs (#24221) 2023-04-11 11:35:39 +02:00
profiles_controller_spec.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
sessions_controller_spec.rb
two_factor_authentication_methods_controller_spec.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00