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 /config/initializers/timeout.rb | |
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 'config/initializers/timeout.rb')
-rw-r--r-- | config/initializers/timeout.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb deleted file mode 100644 index de87fd906..000000000 --- a/config/initializers/timeout.rb +++ /dev/null @@ -1,6 +0,0 @@ -Rack::Timeout::Logger.disable -Rack::Timeout.service_timeout = false - -if Rails.env.production? - Rack::Timeout.service_timeout = 90 -end |