diff --git a/Gemfile b/Gemfile index 82ee2a3..7c12d9b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' # Shared Gems gem 'rails', '4.1.7' -gem 'puma', '2.8.2' +gem 'puma', '4.3.11' gem 'faraday', '0.8.9' gem 'activeresource', '4.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index ee83b68..497797f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,14 +99,15 @@ GEM minitest (5.5.1) multi_json (1.10.1) multipart-post (1.2.0) + nio4r (2.5.8) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) octokit (3.2.0) sawyer (~> 0.5.3) phantomjs (1.9.7.1) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) + puma (4.3.11) + nio4r (~> 2.0) + rack (1.5.5) rack-protection (1.5.3) rack rack-test (0.6.3) @@ -215,7 +216,7 @@ DEPENDENCIES kramdown (= 1.4.0) octokit (= 3.2.0) phantomjs (= 1.9.7.1) - puma (= 2.8.2) + puma (= 4.3.11) rails (= 4.1.7) rspec-rails (= 3.1.0) sass (= 3.3.9)