Upgrade uglifier gem

11 years ago · 9971a9aa7a
parent aa20d4a88f
commit 9971a9aa7a
2 changed files with 4 additions and 4 deletions
--- a/2
+++ b/2
@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'rails',                '~> 4.0.1'
 gem 'sass-rails',           '~> 4.0.1'
 gem 'coffee-rails',         '~> 4.0.1'
+gem 'uglifier',             '>= 2.3.1'
 gem 'protected_attributes', '~> 1.0.5'

 gem 'jquery-rails',         '~> 3.0.4'
@ -23,7 +24,6 @@ gem 'open4',                '~> 1.3.0'
 gem 'redcarpet',            '~> 2.2.2'
 gem 'slim',                 '~> 2.0.0'
 gem 'dotenv-rails',         '~> 0.8'
-gem 'uglifier',             '>= 2.1.2'
 gem 'sinatra',              '~> 1.4.3', :require => false
 gem 'active_model_serializers', '~> 0.8.1'
 gem 'yajl-ruby',            '~> 1.1.0', :require => 'yajl'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -299,9 +299,9 @@ GEM
      polyglot
      polyglot (>= 0.3.1)
    tzinfo (0.3.38)
-    uglifier (2.1.2)
+    uglifier (2.3.1)
      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
    unicorn (4.6.3)
      kgio (~> 2.6)
      rack
@ -359,7 +359,7 @@ DEPENDENCIES
  sinatra (~> 1.4.3)
  slim (~> 2.0.0)
  thin (~> 1.5.0)
-  uglifier (>= 2.1.2)
+  uglifier (>= 2.3.1)
  unicorn (~> 4.6.2)
  yajl-ruby (~> 1.1.0)
  zeus (= 0.13.4.pre2)