diff options
| author | ThibG <thib@sitedethib.com> | 2018-06-16 15:08:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-16 15:08:52 +0200 |
| commit | c08a2495589183f39cf44ac4c9b71f81dd9dacdc (patch) | |
| tree | 15f4291e3d955f17489f3c43ab711dc536c32bb8 /Gemfile | |
| parent | e8ccac468af9530b4f4d38598859efdb2eb48976 (diff) | |
| parent | db200226b805db324a8efdfb951d7725eac3f9da (diff) | |
Merge pull request #544 from ThibG/glitch-soc/merge-upstream
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index ecf9d2230..96204c66e 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,6 @@ gem 'pundit', '~> 1.1' gem 'premailer-rails' gem 'rack-attack', '~> 5.2' gem 'rack-cors', '~> 1.0', require: 'rack/cors' -gem 'rack-timeout', '~> 0.4' gem 'rails-i18n', '~> 5.1' gem 'rails-settings-cached', '~> 0.6' gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis'] |