diff --git a/Gemfile b/Gemfile index 29052c87b..fd9f75781 100644 --- a/Gemfile +++ b/Gemfile @@ -76,7 +76,7 @@ gem 'bootstrap3-datetimepicker-rails', '~> 3.1.3' # moment.js for dates gem 'momentjs-rails', '>= 2.8.1' -gem 'sprockets', '~> 2.12.4' +gem 'sprockets', '~> 2.12.5' # font-awesome (recommended to be here, not in the assets group) gem 'font-awesome-rails', '~> 4.1.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index f55e8a0fa..55773c9a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -296,7 +296,7 @@ GEM momentjs-rails (2.8.3) railties (>= 3.1) mono_logger (1.1.0) - multi_json (1.12.0) + multi_json (1.14.1) multi_xml (0.5.5) mysql2 (0.3.21) net-dhcp (1.3.2) @@ -470,7 +470,7 @@ GEM slop (3.6.0) socksify (1.7.0) spring (1.3.4) - sprockets (2.12.4) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -633,7 +633,7 @@ DEPENDENCIES simple_form (~> 3.1.0) simplecov spring - sprockets (~> 2.12.4) + sprockets (~> 2.12.5) sqlite3 therubyracer timecop