Merge pull request #153 from jasnow/master
Upgraded to ruby 2.1.3 and multiple gems by Gemfile.lock rebuild.
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
2.1.2
|
||||
2.1.3
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
language: ruby
|
||||
rvm:
|
||||
- "2.1.2"
|
||||
- "2.1.3"
|
||||
before_script: rake db:setup
|
||||
before_script: bundle exec rake db:setup
|
||||
env: RAILSGOAT_MAINTAINER=true
|
||||
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
|
||||
#don't upgrade
|
||||
gem 'rails', '3.2.19'
|
||||
|
||||
ruby '2.1.2'
|
||||
ruby '2.1.3'
|
||||
|
||||
# Bundle edge Rails instead:
|
||||
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
||||
|
||||
+7
-7
@@ -56,7 +56,7 @@ GEM
|
||||
bundler-audit (0.3.1)
|
||||
bundler (~> 1.2)
|
||||
thor (~> 0.18)
|
||||
capybara (2.4.1)
|
||||
capybara (2.4.3)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
@@ -96,7 +96,7 @@ GEM
|
||||
eventmachine (1.0.3)
|
||||
execjs (2.2.1)
|
||||
fastercsv (1.5.5)
|
||||
ffi (1.9.3)
|
||||
ffi (1.9.4)
|
||||
foreman (0.75.0)
|
||||
dotenv (~> 0.11.1)
|
||||
thor (~> 0.19.1)
|
||||
@@ -117,7 +117,7 @@ GEM
|
||||
guard-brakeman (0.8.2)
|
||||
brakeman (>= 2.1.1)
|
||||
guard (>= 1.1.0)
|
||||
guard-livereload (2.3.0)
|
||||
guard-livereload (2.3.1)
|
||||
em-websocket (~> 0.5)
|
||||
guard (~> 2.0)
|
||||
multi_json (~> 1.8)
|
||||
@@ -144,7 +144,7 @@ GEM
|
||||
kgio (2.9.2)
|
||||
launchy (2.4.2)
|
||||
addressable (~> 2.3)
|
||||
libv8 (3.16.14.5)
|
||||
libv8 (3.16.14.7)
|
||||
listen (2.7.9)
|
||||
celluloid (>= 0.15.2)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
@@ -237,15 +237,15 @@ GEM
|
||||
sexp_processor (~> 4.0)
|
||||
ruby_parser (3.5.0)
|
||||
sexp_processor (~> 4.1)
|
||||
sass (3.4.3)
|
||||
sass (3.4.5)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
sexp_processor (4.4.4)
|
||||
simplecov (0.9.0)
|
||||
simplecov (0.9.1)
|
||||
docile (~> 1.1.0)
|
||||
multi_json
|
||||
multi_json (~> 1.0)
|
||||
simplecov-html (~> 0.8.0)
|
||||
simplecov-html (0.8.0)
|
||||
sinatra (1.4.5)
|
||||
|
||||
Reference in New Issue
Block a user