fixing travis

ksylvest · Dec 4, 2014 · 2c2331b · 2c2331b
1 parent b09b4a5
commit 2c2331b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,8 @@ rvm:
   - 1.9.3
   - jruby
 gemfile:
-  - gemfiles/4.0.5.gemfile
-  - gemfiles/4.1.1.gemfile
+  - gemfiles/4.0.12.gemfile
+  - gemfiles/4.1.8.gemfile
 script:
   - "sh -c 'cd test/dummy && bundle exec rake db:create db:migrate db:test:prepare'"
   - "bundle exec rake test"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -44,7 +44,7 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
-    attached (1.0.6)
+    attached (1.0.7)
       fog
       identifier
       rails (> 3.0.0)

diff --git a/gemfiles/4.0.12.gemfile.lock b/gemfiles/4.0.12.gemfile.lock
@@ -37,7 +37,7 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (4.0.2)
-    attached (1.0.6)
+    attached (1.0.7)
       fog
       identifier
       rails (> 3.0.0)

diff --git a/gemfiles/4.1.8.gemfile.lock b/gemfiles/4.1.8.gemfile.lock
@@ -39,7 +39,7 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
-    attached (1.0.6)
+    attached (1.0.7)
       fog
       identifier
       rails (> 3.0.0)
@@ -168,20 +168,21 @@ GEM
       builder
       nokogiri (>= 1.4.1)
       trollop
-    sass (3.4.9)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)