Merge branch 'pr-132'
This commit is contained in:
@@ -1 +1 @@
|
||||
rvm use 2.0.0@railsgoat --create
|
||||
rvm use 2.1.2@railsgoat --create
|
||||
|
||||
+1
-1
@@ -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
|
||||
@@ -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'
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user