summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-07-01 09:34:02 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-07-01 09:34:02 -0600
commitfb056c78a7348b8f00024c908fa4b13c606cc1a7 (patch)
treebbe678ad1e808860ad124c4d033f338d3b1eae55 /Gemfile.lock
parent984698dc968828495d6a1680231775924b0979d4 (diff)
downloadgitlab-ce-fb056c78a7348b8f00024c908fa4b13c606cc1a7.tar.gz
Upgrade Thin from 1.6.1 to 1.7.0.
Includes support for Rack 2. Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index f99b373dbbd..195cc7a9d3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -727,10 +727,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)
@@ -973,7 +973,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)