diff --git a/Gemfile b/Gemfile index ab27d84..98564f1 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'bcrypt-ruby', '~> 3.0.0' gem 'mysql2' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' +gem 'uglifier', '~> 2.7' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index d74d455..ef8c9a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,9 +154,9 @@ GEM rails (>= 3.1) railties (>= 3.1) tzinfo (0.3.55) - uglifier (2.1.2) + uglifier (2.7.2) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) unicorn (5.5.1) kgio (~> 2.6) rack @@ -187,7 +187,7 @@ DEPENDENCIES therubyracer turbolinks twitter-bootstrap-rails - uglifier (>= 1.3.0) + uglifier (~> 2.7) unicorn BUNDLED WITH