team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #153 from jasnow/master

Browse Source 
Upgraded to ruby 2.1.3 and multiple gems by Gemfile.lock rebuild.
This commit is contained in:
Ken Johnson
2014-09-24 16:29:16 -04:00
parent 1466c69616 db36993e1f
commit 0a898472b4
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ruby-version
+1 -1
View File
@@ -1 +1 @@
2.1.2 2.1.3
.travis.yml
+1 -1
View File
@@ -1,6 +1,6 @@
language: ruby language: ruby
rvm: rvm:
- "2.1.2" - "2.1.3"
before_script: rake db:setup before_script: rake db:setup
before_script: bundle exec rake db:setup before_script: bundle exec rake db:setup
env: RAILSGOAT_MAINTAINER=true env: RAILSGOAT_MAINTAINER=true
Gemfile
+1 -1
View File
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
#don't upgrade #don't upgrade
gem 'rails', '3.2.19' gem 'rails', '3.2.19'
ruby '2.1.2' ruby '2.1.3'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
Gemfile.lock
+7 -7
View File
@@ -56,7 +56,7 @@ GEM
bundler-audit (0.3.1) bundler-audit (0.3.1)
bundler (~> 1.2) bundler (~> 1.2)
thor (~> 0.18) thor (~> 0.18)
capybara (2.4.1) capybara (2.4.3)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
@@ -96,7 +96,7 @@ GEM
eventmachine (1.0.3) eventmachine (1.0.3)
execjs (2.2.1) execjs (2.2.1)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.9.3) ffi (1.9.4)
foreman (0.75.0) foreman (0.75.0)
dotenv (~> 0.11.1) dotenv (~> 0.11.1)
thor (~> 0.19.1) thor (~> 0.19.1)
@@ -117,7 +117,7 @@ GEM
guard-brakeman (0.8.2) guard-brakeman (0.8.2)
brakeman (>= 2.1.1) brakeman (>= 2.1.1)
guard (>= 1.1.0) guard (>= 1.1.0)
guard-livereload (2.3.0) guard-livereload (2.3.1)
em-websocket (~> 0.5) em-websocket (~> 0.5)
guard (~> 2.0) guard (~> 2.0)
multi_json (~> 1.8) multi_json (~> 1.8)
@@ -144,7 +144,7 @@ GEM
kgio (2.9.2) kgio (2.9.2)
launchy (2.4.2) launchy (2.4.2)
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.5) libv8 (3.16.14.7)
listen (2.7.9) listen (2.7.9)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
@@ -237,15 +237,15 @@ GEM
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
ruby_parser (3.5.0) ruby_parser (3.5.0)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.4.3) sass (3.4.5)
sass-rails (3.2.6) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
sexp_processor (4.4.4) sexp_processor (4.4.4)
simplecov (0.9.0) simplecov (0.9.1)
docile (~> 1.1.0) docile (~> 1.1.0)
multi_json multi_json (~> 1.0)
simplecov-html (~> 0.8.0) simplecov-html (~> 0.8.0)
simplecov-html (0.8.0) simplecov-html (0.8.0)
sinatra (1.4.5) sinatra (1.4.5)