summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-06 12:13:28 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-06 12:13:28 +0300
commit1738c17f331ca84700e028b653c3c4cb5b1eb7a8 (patch)
tree41ddbf82b623e949c93fb38778c7379c0314425f /Gemfile.lock
parent2643ee72a9c1735fd045d751f0f56a286ea0759c (diff)
downloadgitlab-ce-1738c17f331ca84700e028b653c3c4cb5b1eb7a8.tar.gz
Update puma
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 369be882e14..c0cc4cf415b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -306,7 +306,7 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
- puma (2.1.1)
+ puma (2.3.0)
rack (>= 1.1, < 2.0)
pygments.rb (0.4.2)
posix-spawn (~> 0.3.6)
@@ -576,7 +576,7 @@ DEPENDENCIES
pg
poltergeist (~> 1.3.0)
pry
- puma (~> 2.1.1)
+ puma (~> 2.3.0)
quiet_assets (~> 1.0.1)
rack-mini-profiler
rails (= 3.2.13)