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

Merge branch 'pr-101'

Browse Source
This commit is contained in:
cktricky
2014-03-26 12:54:53 -04:00
parent 70b44b36ad 77b6160be9
commit c602441216
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -1,5 +1,5 @@
language: ruby
rvm:
- "1.9.3"
before_script: rake db:setup
before_script: bundle exec rake db:setup
env: RAILSGOAT_MAINTAINER=true
Gemfile
+2
View File
@@ -4,6 +4,8 @@ source 'https://rubygems.org'
gem 'rails', '3.2.11'
gem 'rack', '1.4.0'
gem 'rack-ssl', '1.3.4'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Gemfile.lock
+17 -16
View File
@@ -28,7 +28,7 @@ GEM
activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.5)
addressable (2.3.6)
arel (3.0.3)
aruba (0.5.4)
childprocess (>= 0.3.6)
@@ -42,7 +42,7 @@ GEM
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
brakeman (2.4.1)
brakeman (2.4.3)
erubis (~> 2.6)
fastercsv (~> 1.5)
haml (>= 3.0, < 5.0)
@@ -109,16 +109,16 @@ GEM
trollop (~> 2.0)
gherkin (2.12.2)
multi_json (~> 1.3)
guard (2.5.1)
guard (2.6.0)
formatador (>= 0.2.4)
listen (~> 2.6)
listen (~> 2.7)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-brakeman (0.8.1)
brakeman (>= 2.1.1)
guard (>= 1.1.0)
guard-livereload (2.1.1)
guard-livereload (2.1.2)
em-websocket (~> 0.5)
guard (~> 2.0)
multi_json (~> 1.8)
@@ -151,7 +151,7 @@ GEM
celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.4)
lumberjack (1.0.5)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -167,9 +167,9 @@ GEM
thin (~> 1.5.0)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.2)
multi_json (1.9.0)
multi_test (0.0.3)
mini_portile (0.5.3)
multi_json (1.9.2)
multi_test (0.1.1)
nio4r (1.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
@@ -192,7 +192,7 @@ GEM
rack
rack-protection (1.5.2)
rack
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@ -212,7 +212,7 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.13.0)
rake (10.1.1)
rake (10.2.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
ffi (>= 0.5.0)
@@ -227,7 +227,7 @@ GEM
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.6)
rspec-rails (2.14.1)
rspec-rails (2.14.2)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
@@ -235,18 +235,18 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
ruby2ruby (2.0.7)
ruby2ruby (2.0.8)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.4.1)
sexp_processor (~> 4.1)
safe_yaml (0.9.7)
sass (3.3.3)
sass (3.3.4)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sexp_processor (4.4.2)
sexp_processor (4.4.3)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
@@ -278,7 +278,7 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.18.1)
thor (0.19.1)
tilt (1.4.1)
timers (1.1.0)
travis-lint (1.8.0)
@@ -329,6 +329,7 @@ DEPENDENCIES
pry
rack (= 1.4.0)
rack-livereload
rack-ssl (= 1.3.4)
rails (= 3.2.11)
rb-fsevent
rspec-rails