mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-27 15:01:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/controllers/settings
History
Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
  Upstream changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/models/user.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc not preventing moved accounts from logging
  in.
  Ported upstream changes while keeping the ability for moved accounts to log
  in.
- `app/policies/status_policy.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's ability  to hide followers count.
  Ported upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored and changed the logic surrounding suspended accounts.
  Minor conflict due to glitch-soc's local-only toots.
  Ported upstream changes.
- `package.json`:
  Not a real conflict, upstream updated dependencies that were too close to
  glitch-soc-only ones in the file.
2020-09-28 14:13:30 +02:00
..
exports Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02: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 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
aliases_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
applications_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
base_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
deletes_controller.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
exports_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
featured_tags_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
flavours_controller.rb Revert some refactoring in order to make codebase closer to upstream 2019-07-23 10:51:12 +02:00
identity_proofs_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
imports_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
migrations_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
pictures_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
preferences_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
profiles_controller.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02: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