Ruby version change in travis and undo of prior temp rake version limit

openstax · Mar 10, 2016 · fd7a093 · fd7a093
1 parent a38f7e8
commit fd7a093
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ cache: bundler
 addons:
   postgresql: "9.3"
 rvm:
-  - "1.9.3-p547"
+  - "2.2.3"
 before_install:
   - cp config/secret_settings.yml.example config/secret_settings.yml
   - wget 'https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2'

diff --git a/Gemfile b/Gemfile
@@ -52,9 +52,6 @@ gem 'pg'
 # Add P3P headers for IE
 gem 'p3p'
 
-# Limit until rspec updated (otherwise get `last_comment` errors)
-gem 'rake', '~> 10.4'
-
 group :assets do
   gem 'sass-rails',   '~> 3.2.6'
   gem 'coffee-rails', '~> 3.2.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -235,7 +235,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.13.0)
-    rake (10.5.0)
+    rake (11.0.1)
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
@@ -375,7 +375,6 @@ DEPENDENCIES
   poltergeist
   quiet_assets
   rails (= 3.2.22)
-  rake (~> 10.4)
   representable (~> 2.1.3)
   roar-rails
   rspec-rails (~> 3.0)