- Fixed dependency on latest sprockets-rails version from github, so …

…as to fix wrong sprockets dependency
vipulnsward · Jun 24, 2015 · 8358bdf · 8358bdf
1 parent 4425bbe
commit 8358bdf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'rails', '4.2.1'
 gem 'arel'
 gem 'jquery-rails'
 
-gem 'sprockets-rails'
+gem 'sprockets-rails', github: 'rails/sprockets-rails'
 gem 'sass-rails', '>= 5.0.3'
 gem 'uglifier', '>= 2.7.1'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,6 +30,15 @@ GIT
     devise-async (0.9.0)
       devise (~> 3.2)
 
+GIT
+  remote: git://github.com/rails/sprockets-rails.git
+  revision: 7bd1560360248ab11d8aba81e558bd817935c692
+  specs:
+    sprockets-rails (3.0.0.beta1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0, < 4.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -272,10 +281,6 @@ GEM
     sprockets-es6 (0.6.2)
       babel-transpiler
       sprockets (>= 3.0.0)
-    sprockets-rails (2.3.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
     thin (1.6.3)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0)
@@ -334,8 +339,11 @@ DEPENDENCIES
   simplecov
   spring
   sprockets-es6
-  sprockets-rails
+  sprockets-rails!
   thin
   uglifier (>= 2.7.1)
   unicorn
   web-console (~> 2.0)
+
+BUNDLED WITH
+   1.10.1