diff --git a/Gemfile b/Gemfile index 21156a7..baae425 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby '2.0.0' gem 'rails', '4.0.8' gem 'bootstrap-sass', '2.3.2.0' -gem 'sprockets', '2.11.0' +gem 'sprockets', '2.12.5' gem 'bcrypt-ruby', '3.1.2' gem 'faker', '1.1.2' gem 'will_paginate', '3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index c2544d0..2e670e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM mime-types (1.25.1) mini_portile (0.6.0) minitest (4.7.5) - multi_json (1.10.1) + multi_json (1.14.1) multi_test (0.1.1) nokogiri (1.6.2.1) mini_portile (= 0.6.0) @@ -124,7 +124,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.5.2) + rack (1.5.5) rack-test (0.6.2) rack (>= 1.0) rails (4.0.8) @@ -185,7 +185,7 @@ GEM spork-rails (4.0.0) rails (>= 3.0.0, < 5) spork (>= 1.0rc0) - sprockets (2.11.0) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -240,7 +240,7 @@ DEPENDENCIES sdoc (= 0.3.20) selenium-webdriver (= 2.35.1) spork-rails (= 4.0.0) - sprockets (= 2.11.0) + sprockets (= 2.12.5) sqlite3 (= 1.3.8) turbolinks (= 1.1.1) uglifier (= 2.1.1)