~cytrogen/masto-fe

ref: 1a4a23b5c8a8e0beacded9bc44354e3f8778ae26 masto-fe/Gemfile.lock -rw-r--r-- 22.6 KiB
9af24835 — Claire 2 years ago
Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f
53f5b27b — Claire 2 years ago
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
a5dbb1ee — Claire 2 years ago
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
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.
027c1bef — renovate[bot] 2 years ago
Update dependency active_model_serializers to v0.10.14 (#27303)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
c4cff3d7 — Renaud Chaput 2 years ago
Remove Capistrano (#27295)

5606a179 — renovate[bot] 2 years ago
Update dependency sidekiq to v6.5.10 (#27287)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
e836d078 — renovate[bot] 2 years ago
Update dependency haml_lint to v0.51.0 (#27250)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
f9eefb27 — renovate[bot] 2 years ago
Update dependency rubocop to v1.56.4 (#27188)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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
fdc9f971 — renovate[bot] 2 years ago
Update dependency selenium-webdriver to v4.13.1 (#27141)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
743fede5 — Claire 2 years ago
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
e193c848 — Claire 2 years ago
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
3ca94f6d — Claire 2 years ago
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
97e4011c — renovate[bot] 2 years ago
Update dependency rails to v7.0.8 (#26907)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
9ac9aca1 — renovate[bot] 2 years ago
Update dependency test-prof to v1.2.3 (#26894)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
77300836 — renovate[bot] 2 years ago
Update dependency kt-paperclip to v7.2.1 (#26869)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
b98edfa4 — renovate[bot] 2 years ago
Update dependency rubocop to v1.56.3 (#26883)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Next