~cytrogen/masto-fe

masto-fe/config d---------
702d1629 — Claire 2 years ago 
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
d7fcd700 — Claire 2 years ago 
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
19ebf779 — Claire 2 years ago 
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
695e42de — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27202)

Co-authored-by: GitHub Actions <noreply@github.com>
56c0babc — Matt Jankowski 2 years ago 
Fix rubocop `Layout/ArgumentAlignment` cop (#26060)
b93ce7d8 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27168)

Co-authored-by: GitHub Actions <noreply@github.com>
ebd20175 — Georg Gadinger 2 years ago 
fix Content-Security-Policy when using Azure storage (#2427)
fde89a8f — Claire 2 years ago 
Merge pull request #2426 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 57f592fed50747f3c97718a2761e17bafe6c8698
abdb5884 — Claire 2 years ago 
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
5ea3e8e7 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27144)

Co-authored-by: GitHub Actions <noreply@github.com>
736fe753 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27080)

Co-authored-by: GitHub Actions <noreply@github.com>
e8245855 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27052)

Co-authored-by: GitHub Actions <noreply@github.com>
c04b08a3 — Claire 2 years ago 
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f05985f8 — Claire 2 years ago 
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
8acc7543 — Claire 2 years ago 
Change S3 checksum mode to be disabled by default (#27007)
effe4728 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27005)

Co-authored-by: GitHub Actions <noreply@github.com>
61fe25fe — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26988)

Co-authored-by: GitHub Actions <noreply@github.com>
57f47e50 — Claire 2 years ago 
Merge pull request #2416 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f546b0c9 — Claire 2 years ago 
Merge branch 'main' into glitch-soc/merge-upstream
73ecc4de — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26978)

Co-authored-by: GitHub Actions <noreply@github.com>
Next