diff options
| author | halna_Tanaguru <fhalna@oceaneconsulting.com> | 2017-04-04 12:06:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 12:06:53 +0200 |
| commit | 3abb0f7bc708ae8ca387aee8560b9558f8b209ba (patch) | |
| tree | 6014fdec3201d9e40fa244b821bdaffc83bfa131 /Gemfile | |
| parent | 3f30ae1f97717177f29711d5b99d7970c6b75b3e (diff) | |
| parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 440f2e87b..46baed307 100644 --- a/Gemfile +++ b/Gemfile @@ -50,6 +50,8 @@ gem 'rails-settings-cached' gem 'simple-navigation' gem 'statsd-instrument' gem 'ruby-oembed', require: 'oembed' +gem 'rack-timeout' +gem 'tzinfo-data' gem 'react-rails' gem 'browserify-rails' @@ -89,5 +91,4 @@ group :production do gem 'rails_12factor' gem 'redis-rails' gem 'lograge' - gem 'rack-timeout' end |