From 1bea104205c880b2f501a0588f72761b924772dd Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 25 Jun 2014 13:04:14 -0400 Subject: [PATCH] New 2.1.2 branch changes for Ruby 2.1.2 upgrade --- .rvmrc | 2 +- .travis.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 4 ++-- README.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.rvmrc b/.rvmrc index 8adb56f..97ca0d8 100755 --- a/.rvmrc +++ b/.rvmrc @@ -1 +1 @@ -rvm use 2.0.0@railsgoat --create +rvm use 2.1.2@railsgoat --create diff --git a/.travis.yml b/.travis.yml index 7a195bc..0d20e2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - "2.0.0" + - "2.1.2" before_script: rake db:setup before_script: bundle exec rake db:setup env: RAILSGOAT_MAINTAINER=true \ No newline at end of file diff --git a/Gemfile b/Gemfile index f4a2000..d9216fe 100755 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'rails', '3.2.11' gem 'rack', '1.4.0' -ruby '2.0.0' +ruby '2.1.2' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 0a337e3..6a954a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,7 +116,7 @@ GEM guard-brakeman (0.8.1) brakeman (>= 2.1.1) guard (>= 1.1.0) - guard-livereload (2.2.0) + guard-livereload (2.3.0) em-websocket (~> 0.5) guard (~> 2.0) multi_json (~> 1.8) @@ -148,7 +148,7 @@ GEM celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.7) + lumberjack (1.0.8) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) diff --git a/README.md b/README.md index 7e1aac2..d9ac783 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ To begin, install the Ruby Version Manager (RVM): ``` $ curl -L https://get.rvm.io | bash -s stable --autolibs=3 --ruby=1.9.3 -$ rvm use 2.0.0@railsgoat --create # https://rvm.io/ +$ rvm use 2.1.2@railsgoat --create # https://rvm.io/ ``` After installing the package, clone this repo: