diff --git a/Gemfile b/Gemfile index 25b04d3e5..0143707e4 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ gem 'time_diff' gem 'sass-rails', '~> 4.0.1' gem 'coffee-rails', '~> 4.0.1' gem 'compass-rails', '~> 1.1.6' -gem 'uglifier', '~> 2.4' +gem 'uglifier', '~> 2.5' gem 'therubyracer', '~> 0.12.1', platforms: [:mri, :rbx] gem 'therubyrhino', '~> 1.73.1', platforms: :jruby diff --git a/Gemfile.lock b/Gemfile.lock index 323825d32..b7fe9b6ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -494,7 +494,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.39) - uglifier (2.4.0) + uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) underscore-rails (1.6.0) @@ -610,7 +610,7 @@ DEPENDENCIES therubyrhino (~> 1.73.1) time_diff timecop - uglifier (~> 2.4) + uglifier (~> 2.5) underscore-rails whenever (~> 0.9.0) wikicloth