summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-08 07:38:19 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-08 07:38:19 +0300
commitdb11c1fd88660c3cf49ddb737f2b709981c0f554 (patch)
tree65273f59e10b7992f67e52767694461b8232eeb7
parent1738c17f331ca84700e028b653c3c4cb5b1eb7a8 (diff)
downloadgitlab-ce-db11c1fd88660c3cf49ddb737f2b709981c0f554.tar.gz
Puma to 2.3.1
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index d6037d87067..3810073c260 100644
--- a/Gemfile
+++ b/Gemfile
@@ -76,7 +76,7 @@ gem "github-markup", "~> 0.7.4", require: 'github/markup'
gem "asciidoctor"
# Servers
-gem "puma", '~> 2.3.0'
+gem "puma", '~> 2.3.1'
# State machine
gem "state_machine"
diff --git a/Gemfile.lock b/Gemfile.lock
index c0cc4cf415b..f259f908a22 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.3.0)
+ puma (2.3.1)
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.3.0)
+ puma (~> 2.3.1)
quiet_assets (~> 1.0.1)
rack-mini-profiler
rails (= 3.2.13)