summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-08 12:56:50 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-08 12:56:50 +0200
commitc324b63236c914c827bf3d10ab6cfd8f1e321a75 (patch)
tree7c09373874caea5f4eff986555023362db67cd7a
parent8a6809a733c2c69c2dd0f51be6c820d3c1f40d66 (diff)
downloadgitlab-ci-c324b63236c914c827bf3d10ab6cfd8f1e321a75.tar.gz
Update puma
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 682b248..7ef2d2a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'pg', group: :postgres
gem 'settingslogic'
# Web server
-gem "puma", "~> 2.3.2"
+gem "puma", "~> 2.7.1"
# Haml
gem 'haml-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1606b2f..1a49e4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -173,7 +173,7 @@ GEM
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
- puma (2.3.2)
+ puma (2.7.1)
rack (>= 1.1, < 2.0)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
@@ -329,7 +329,7 @@ DEPENDENCIES
poltergeist
protected_attributes
pry
- puma (~> 2.3.2)
+ puma (~> 2.7.1)
quiet_assets
rails (= 4.0.2)
rake