mastodon/app/views/settings
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
..
aliases
applications
deletes Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
exports
featured_tags Fix featured tag display name in setting (#19404) 2022-10-21 13:22:02 +02:00
flavours
imports
login_activities
migration/redirects Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
migrations Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
preferences Add “Glitch-only” label to glitch-specific settings 2022-11-12 11:30:35 +01:00
profiles Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
shared
two_factor_authentication Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
two_factor_authentication_methods