diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-20 02:01:38 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-20 02:01:38 +0000 |
| commit | b99221e6f076972aafd5967bf2421141b735b065 (patch) | |
| tree | 561f3e15019b9d2e99aab3f0a924641f88c78988 /lib | |
| parent | d5a259d43ecf6713b443da25b2d765580b8f7e42 (diff) | |
| parent | efd8491d4906d190abc5e190a2111c04b01b729b (diff) | |
| download | gitlab-ce-b99221e6f076972aafd5967bf2421141b735b065.tar.gz | |
Merge branch 'revert-unicorn-timeout' into 'master'
Revert "Increase timeout for Git-over-HTTP requests."
This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.
For #2164
cc @marin @douwe
See merge request !1730
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/middleware/timeout.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/lib/gitlab/middleware/timeout.rb b/lib/gitlab/middleware/timeout.rb deleted file mode 100644 index 015600392b9..00000000000 --- a/lib/gitlab/middleware/timeout.rb +++ /dev/null @@ -1,13 +0,0 @@ -module Gitlab - module Middleware - class Timeout < Rack::Timeout - GRACK_REGEX = /[-\/\w\.]+\.git\//.freeze - - def call(env) - return @app.call(env) if env['PATH_INFO'] =~ GRACK_REGEX - - super - end - end - end -end |