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 /Gemfile.lock | |
| 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 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 71936584d6e..54753f5e016 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,7 +147,6 @@ GEM enumerize (0.7.0) activesupport (>= 3.2) equalizer (0.0.8) - errbase (0.0.2) erubis (2.7.0) escape_utils (0.2.4) eventmachine (1.0.4) @@ -429,7 +428,6 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rack-timeout (0.2.0) rails (4.1.9) actionmailer (= 4.1.9) actionpack (= 4.1.9) @@ -482,8 +480,6 @@ GEM rest-client (1.6.7) mime-types (>= 1.16) rinku (1.7.3) - robustly (0.0.3) - errbase rouge (1.7.4) rspec (2.99.0) rspec-core (~> 2.99.0) @@ -566,9 +562,6 @@ GEM temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) slop (3.6.0) - slowpoke (0.0.5) - rack-timeout (>= 0.1.0) - robustly spinach (0.8.7) colorize (= 0.5.8) gherkin-ruby (>= 0.3.1) @@ -776,7 +769,6 @@ DEPENDENCIES six slack-notifier (~> 1.0.0) slim - slowpoke spinach-rails spring (~> 1.3.1) spring-commands-rspec (= 1.0.4) |