diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-03-23 10:15:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-23 10:15:13 +0100 |
commit | 867790e07a149b1213936c3ff1fc5815d37e2e94 (patch) | |
tree | d165b5ba19e907a8e57b1abf5ab5cf408419e051 /Gemfile | |
parent | 02ac94490a67659c7cc669ead5b107b724db6e68 (diff) | |
parent | b4f60bc6de4ece3b2ff908d31a0c34ddbbfacf2c (diff) |
Merge pull request #2144 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 752874978..8cb99a9ef 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ gem 'public_suffix', '~> 5.0' gem 'pundit', '~> 2.3' gem 'premailer-rails' gem 'rack-attack', '~> 6.6' -gem 'rack-cors', '~> 1.1', require: 'rack/cors' +gem 'rack-cors', '~> 2.0', require: 'rack/cors' gem 'rails-i18n', '~> 6.0' gem 'rails-settings-cached', '~> 0.6', git: 'https://github.com/mastodon/rails-settings-cached.git', branch: 'v0.6.6-aliases-true' gem 'redcarpet', '~> 3.6' |