Merge b276751 into 1450a57

digitaltom · Feb 2, 2019 · 5c22b96 · 5c22b96
2 parents 1450a57 + b276751
commit 5c22b96
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 gem 'rails', '~> 4.2'
 gem 'sqlite3'
 # angular-rails-templates currently only works with sprocket-rails 2
-gem 'sprockets-rails', '~> 2.3.3'
+gem 'sprockets-rails', '~> 3.2.1'
 
 gem 'angular-rails-templates'
 gem 'angular_rails_csrf'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -188,10 +188,10 @@ GEM
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     temple (0.8.0)
     term-ansicolor (1.6.0)
@@ -238,7 +238,7 @@ DEPENDENCIES
   rubocop
   simplecov
   simplecov-console
-  sprockets-rails (~> 2.3.3)
+  sprockets-rails (~> 3.2.1)
   sqlite3
   uglifier (>= 1.3.0)
   unicorn-rails