diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-01 16:17:54 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-01 16:17:54 +0000 |
| commit | d9edea9735e01ff560cf77697719cc1db248ecef (patch) | |
| tree | 9ee674699297a03fdf1f5c2796cd629026fa2fef /Gemfile.lock | |
| parent | 557ca2b31ff503b36a4b65af2641fcd0f5682d5b (diff) | |
| parent | fb056c78a7348b8f00024c908fa4b13c606cc1a7 (diff) | |
| download | gitlab-ce-d9edea9735e01ff560cf77697719cc1db248ecef.tar.gz | |
Merge branch 'upgrade-thin' into 'master'
Upgrade Thin from 1.6.1 to 1.7.0.
Includes support for Rack 2. Working toward #14286.
Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG
See merge request !5047
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b1f2c8c142c..4e80f67f640 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -725,10 +725,10 @@ GEM temple (0.7.7) test_after_commit (0.4.2) activerecord (>= 3.2) - thin (1.6.4) + thin (1.7.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) - rack (~> 1.0) + rack (>= 1, < 3) thor (0.19.1) thread_safe (0.3.5) tilt (2.0.5) @@ -970,7 +970,7 @@ DEPENDENCIES teaspoon (~> 1.1.0) teaspoon-jasmine (~> 2.2.0) test_after_commit (~> 0.4.2) - thin (~> 1.6.1) + thin (~> 1.7.0) tinder (~> 1.10.0) turbolinks (~> 2.5.0) u2f (~> 0.2.1) |