diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index ba59712c..62db01c0 --- a/Gemfile +++ b/Gemfile @@ -34,7 +34,7 @@ gem "pry" # Needed for a smooth upgrade from Rails 3.2 to Rails 4.0 # http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html gem 'protected_attributes' -gem "puma", "2.11.2" +gem "puma", "4.3.12" gem "pundit" gem "rack-cors", :require => false gem 'rails', "4.2" diff --git a/Gemfile.lock b/Gemfile.lock index e155fbb2..6418df28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,8 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (4.0.7) + haml (5.1.2) + temple (>= 0.8.0) tilt heapy (0.1.3) hitimes (1.2.2) @@ -169,6 +170,7 @@ GEM multi_json (1.11.2) nenv (0.2.0) newrelic_rpm (3.13.0.299) + nio4r (2.5.8) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) notiffany (0.0.7) @@ -191,11 +193,11 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - puma (2.11.2) - rack (>= 1.1, < 2.0) + puma (4.3.12) + nio4r (~> 2.0) pundit (1.0.1) activesupport (>= 3.0.0) - rack (1.6.8) + rack (1.6.13) rack-cache (1.2) rack (>= 0.4) rack-cors (0.4.0) @@ -310,6 +312,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) + temple (0.8.2) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) @@ -358,7 +361,7 @@ DEPENDENCIES foreman google-analytics-rails (= 1.1.1) guard-rspec - haml + haml (= 5.1.2) http_accept_language jbuilder jquery-rails @@ -373,7 +376,7 @@ DEPENDENCIES poltergeist protected_attributes pry - puma (= 2.11.2) + puma (= 4.3.12) pundit rack-cache rack-cors