Merge branch 'timeout' into 'master'
Increase timeout for Git-over-HTTP requests. Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232. Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty. The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`. See merge request !1619
Showing
... | ... | @@ -177,6 +177,9 @@ gem 'ace-rails-ap' |
# Keyboard shortcuts | ||
gem 'mousetrap-rails' | ||
# Shutting down requests that take too long | ||
gem "slowpoke" | ||
gem "sass-rails", '~> 4.0.2' | ||
gem "coffee-rails" | ||
gem "uglifier" | ||
... | ... |
config/initializers/timeout.rb
0 → 100644
lib/gitlab/middleware/timeout.rb
0 → 100644
public/503.html
0 → 100644
想要评论请 注册 或 登录