diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
commit | db200226b805db324a8efdfb951d7725eac3f9da (patch) | |
tree | a7d8298fc65bbd81e2f843048240de6e4fceffcf /config/initializers/timeout.rb | |
parent | afceef74c2377192f100b9307068895ec0ec7d45 (diff) | |
parent | 0df91c7b1e05952ebbfc552915e995d55af0a403 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…
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 |