diff --git a/Gemfile b/Gemfile index e008ae8baae..e4c993cb252 100644 --- a/Gemfile +++ b/Gemfile @@ -126,8 +126,6 @@ gem 'rack-protection' # security # allow everywhere for now cause we are allowing asset debugging in prd group :assets do gem 'sass-rails' - # Sam: disabling for now, having issues with our jenkins build - # gem 'turbo-sprockets-rails3' gem 'uglifier' end diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index 341f0fb52a1..bedecffc9f3 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -153,7 +153,7 @@ GEM celluloid (0.15.2) timers (~> 1.1.0) certified (0.1.1) - coderay (1.0.9) + coderay (1.1.0) connection_pool (1.1.0) daemons (1.1.9) debug_inspector (0.0.2) @@ -188,7 +188,7 @@ GEM rake-compiler fast_xs (0.8.0) fastimage (1.5.2) - ffi (1.9.0) + ffi (1.9.3) fog (1.18.0) builder excon (~> 0.28.0) @@ -257,7 +257,7 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - oj (2.1.7) + oj (2.2.3) omniauth (1.1.4) hashie (>= 1.2, < 3) rack @@ -288,8 +288,8 @@ GEM pg (0.17.0) polyglot (0.3.3) progress (3.0.0) - pry (0.9.12.2) - coderay (~> 1.0.5) + pry (0.9.12.4) + coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) pry-nav (0.2.3) @@ -412,10 +412,10 @@ GEM slim (2.0.1) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) - slop (3.4.6) + slop (3.4.7) sorcerer (1.0.2) spork (1.0.0rc4) - sprockets (2.10.0) + sprockets (2.10.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -443,13 +443,13 @@ GEM polyglot (>= 0.3.1) trollop (2.0) tzinfo (0.3.38) - uglifier (2.2.1) + uglifier (2.3.1) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) unf (0.1.3) unf_ext unf_ext (0.0.6) - unicorn (4.6.3) + unicorn (4.7.0) kgio (~> 2.6) rack raindrops (~> 0.7)