diff --git a/Gemfile b/Gemfile index fd2b1722..0313c3f7 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'uglifier' gem 'coffee-rails' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby +gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index d2681da1..1baa38da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GIT GIT remote: git://github.com/gregbell/active_admin.git - revision: 4f445b51c22b12af2cdde57fe2ce9835c32ef88e + revision: d7dfc134574e08a5509291ee9d5df386540533ce specs: activeadmin (1.0.0.pre) arbre (~> 1.0) @@ -32,27 +32,27 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.2.rc2) - actionpack (= 4.1.2.rc2) - actionview (= 4.1.2.rc2) + actionmailer (4.1.2.rc3) + actionpack (= 4.1.2.rc3) + actionview (= 4.1.2.rc3) mail (~> 2.5.4) - actionpack (4.1.2.rc2) - actionview (= 4.1.2.rc2) - activesupport (= 4.1.2.rc2) + actionpack (4.1.2.rc3) + actionview (= 4.1.2.rc3) + activesupport (= 4.1.2.rc3) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.2.rc2) - activesupport (= 4.1.2.rc2) + actionview (4.1.2.rc3) + activesupport (= 4.1.2.rc3) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.2.rc2) - activesupport (= 4.1.2.rc2) + activemodel (4.1.2.rc3) + activesupport (= 4.1.2.rc3) builder (~> 3.1) - activerecord (4.1.2.rc2) - activemodel (= 4.1.2.rc2) - activesupport (= 4.1.2.rc2) + activerecord (4.1.2.rc3) + activemodel (= 4.1.2.rc3) + activesupport (= 4.1.2.rc3) arel (~> 5.0.0) - activesupport (4.1.2.rc2) + activesupport (4.1.2.rc3) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -136,7 +136,7 @@ GEM em-websocket (~> 0.5) guard (~> 2.0) multi_json (~> 1.8) - guard-minitest (2.3.0) + guard-minitest (2.3.1) guard (~> 2.0) minitest (>= 3.0) haml (4.0.5) @@ -159,7 +159,7 @@ GEM jbuilder (2.1.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (3.1.0) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-turbolinks (2.0.2) @@ -171,6 +171,7 @@ GEM kaminari (0.16.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + libv8 (3.16.14.3) listen (2.7.9) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) @@ -200,22 +201,22 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.2.rc2) - actionmailer (= 4.1.2.rc2) - actionpack (= 4.1.2.rc2) - actionview (= 4.1.2.rc2) - activemodel (= 4.1.2.rc2) - activerecord (= 4.1.2.rc2) - activesupport (= 4.1.2.rc2) + rails (4.1.2.rc3) + actionmailer (= 4.1.2.rc3) + actionpack (= 4.1.2.rc3) + actionview (= 4.1.2.rc3) + activemodel (= 4.1.2.rc3) + activerecord (= 4.1.2.rc3) + activesupport (= 4.1.2.rc3) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.2.rc2) + railties (= 4.1.2.rc3) sprockets-rails (~> 2.0) rails-i18n (4.0.2) i18n (~> 0.6) rails (>= 4.0) - railties (4.1.2.rc2) - actionpack (= 4.1.2.rc2) - activesupport (= 4.1.2.rc2) + railties (4.1.2.rc3) + actionpack (= 4.1.2.rc3) + activesupport (= 4.1.2.rc3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -231,6 +232,7 @@ GEM rdoc (4.1.1) json (~> 1.4) redcarpet (3.1.2) + ref (1.0.5) responders (1.1.0) railties (>= 3.2, < 5) ruby2ruby (2.0.8) @@ -264,6 +266,9 @@ GEM sprockets (~> 2.8) temple (0.6.7) terminal-table (1.4.5) + therubyracer (0.12.1) + libv8 (~> 3.16.14.0) + ref thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -316,6 +321,7 @@ DEPENDENCIES sdoc (~> 0.4.0) simple_calendar! spring + therubyracer turbolinks uglifier webrick (>= 1.3.1)