Attempt to fix travis bundler issue

inossidabile · Jul 29, 2013 · 188d768 · 188d768
1 parent 67679c3
commit 188d768
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 926 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
-gemfiles/rails-3.1.0.gemfile.lock b/gemfiles/rails-3.1.0.gemfile.lock
-gemfiles/rails-3.1.0.gemfile.lock b/gemfiles/rails-3.0.10.gemfile.lock
+gemfiles
 coverage
 tags
diff --git a/.rspec b/.rspec
@@ -1 +1 @@
---tty --colour
+--colour
diff --git a/.travis.yml b/.travis.yml
@@ -3,4 +3,4 @@ before_install:
 rvm:
   - 1.9.3
   - jruby-19mode
-  - 2.0.0
+  - 2.0.0
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/gemfiles/rails_3.1.3.gemfile b/gemfiles/rails_3.1.3.gemfile
diff --git a/gemfiles/rails_3.1.3.gemfile.lock b/gemfiles/rails_3.1.3.gemfile.lock
diff --git a/gemfiles/rails_3.2.12.gemfile b/gemfiles/rails_3.2.12.gemfile
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ before_install: @@
     rvm:
       - 1.9.3
       - jruby-19mode
-      - 2.0.0
+      - 2.0.0