about summary refs log tree commit diff
path: root/config/locales-glitch
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-17 11:55:50 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-11-17 12:01:37 +0100
commitaec61a703f4c1f4724bbb5b912504e19b3303e9d (patch)
treeacae2d7026668653b585ead9af4be3523851ba13 /config/locales-glitch
parentab7d99e035f5b880ef77440e7c2e76f8e8728992 (diff)
parent585cc1a604f6c445436b5bea23c1eb2f899300c3 (diff)
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.
Diffstat (limited to 'config/locales-glitch')
0 files changed, 0 insertions, 0 deletions