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

Merge pull request #260 from jasnow/master

Browse Source 
Thanks, Al!
This commit is contained in:
Ken Johnson
2017-09-18 19:49:13 -04:00
committed by GitHub
parent f8f3564134 3ae9aa6e2c
commit 1fc41f0b8e
6 changed files with 86 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ruby-version
+1 -1
View File
@@ -1 +1 @@
2.3.4
2.3.5
.travis.yml
+1 -1
View File
@@ -1,6 +1,6 @@
language: ruby
rvm:
- "2.3.4"
- "2.3.5"
before_install:
- "phantomjs --version"
Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ruby:2.3.4
FROM ruby:2.3.5
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
RUN mkdir /myapp
WORKDIR /myapp
Gemfile
+4 -5
View File
@@ -1,13 +1,13 @@
source 'https://rubygems.org'
#don't upgrade
gem 'rails', '5.0.1'
gem 'rails', '5.1.4'
ruby '2.3.4'
ruby '2.3.5'
gem 'rake'
gem 'rails-perftest'
gem 'ruby-prof', '0.15.9'
gem 'ruby-prof'
# Bundle edge Rails instead:
# gem 'rails', git: 'https://github.com/rails/rails'
@@ -99,5 +99,4 @@ gem 'therubyracer'
#For Rails 4.2
gem 'responders'
# Locked at 5.10.1, see https://github.com/seattlerb/minitest/issues/689
gem "minitest", "5.10.1"
gem "minitest"
Gemfile.lock
+78 -73
View File
@@ -1,46 +1,46 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.0.1)
actionpack (= 5.0.1)
nio4r (~> 1.2)
actioncable (5.1.4)
actionpack (= 5.1.4)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.1)
actionpack (= 5.0.1)
actionview (= 5.0.1)
activejob (= 5.0.1)
actionmailer (5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.1)
actionview (= 5.0.1)
activesupport (= 5.0.1)
actionpack (5.1.4)
actionview (= 5.1.4)
activesupport (= 5.1.4)
rack (~> 2.0)
rack-test (~> 0.6.3)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.1)
activesupport (= 5.0.1)
actionview (5.1.4)
activesupport (= 5.1.4)
builder (~> 3.1)
erubis (~> 2.7.0)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (5.0.1)
activesupport (= 5.0.1)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.4)
activesupport (= 5.1.4)
globalid (>= 0.3.6)
activemodel (5.0.1)
activesupport (= 5.0.1)
activerecord (5.0.1)
activemodel (= 5.0.1)
activesupport (= 5.0.1)
arel (~> 7.0)
activesupport (5.0.1)
activemodel (5.1.4)
activesupport (= 5.1.4)
activerecord (5.1.4)
activemodel (= 5.1.4)
activesupport (= 5.1.4)
arel (~> 8.0)
activesupport (5.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
arel (7.1.4)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (8.0.0)
aruba (0.14.2)
childprocess (~> 0.5.6)
contracts (~> 0.9)
@@ -49,20 +49,20 @@ GEM
rspec-expectations (>= 2.99)
thor (~> 0.19)
bcrypt (3.1.11)
better_errors (2.1.1)
better_errors (2.3.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
brakeman (3.7.0)
brakeman (3.7.2)
builder (3.2.3)
bundler-audit (0.5.0)
bundler-audit (0.6.0)
bundler (~> 1.2)
thor (~> 0.18)
capybara (2.14.4)
capybara (2.15.1)
addressable
mime-types (>= 1.16)
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
@@ -70,7 +70,7 @@ GEM
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
coderay (1.1.1)
coderay (1.1.2)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0)
@@ -99,8 +99,8 @@ GEM
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.2.3)
erubi (1.6.1)
eventmachine (1.2.5)
execjs (2.7.0)
ffi (1.9.18)
foreman (0.84.0)
@@ -162,48 +162,49 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (0.1.4)
mini_portile2 (2.2.0)
minitest (5.10.1)
multi_json (1.12.1)
minitest (5.10.3)
multi_json (1.12.2)
multi_test (0.1.2)
mysql2 (0.4.8)
mysql2 (0.4.9)
nenv (0.3.0)
nio4r (1.2.1)
nio4r (2.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
poltergeist (1.15.0)
poltergeist (1.16.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
powder (0.3.2)
thor (>= 0.11.5)
power_assert (1.0.2)
power_assert (1.1.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (2.0.5)
public_suffix (3.0.0)
rack (2.0.3)
rack-livereload (0.3.16)
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.1)
actioncable (= 5.0.1)
actionmailer (= 5.0.1)
actionpack (= 5.0.1)
actionview (= 5.0.1)
activejob (= 5.0.1)
activemodel (= 5.0.1)
activerecord (= 5.0.1)
activesupport (= 5.0.1)
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.1)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (5.1.4)
actioncable (= 5.1.4)
actionmailer (= 5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
activemodel (= 5.1.4)
activerecord (= 5.1.4)
activesupport (= 5.1.4)
bundler (>= 1.3.0)
railties (= 5.1.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
@@ -211,14 +212,14 @@ GEM
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-perftest (0.0.7)
railties (5.0.1)
actionpack (= 5.0.1)
activesupport (= 5.0.1)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.18.0)
rake (12.0.0)
raindrops (0.19.0)
rake (12.1.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@@ -238,7 +239,7 @@ GEM
rspec-mocks (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-rails (3.6.0)
rspec-rails (3.6.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -247,9 +248,13 @@ GEM
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
ruby-prof (0.15.9)
ruby-prof (0.16.2)
ruby_dep (1.5.0)
sass (3.4.25)
sass (3.5.1)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
@@ -257,16 +262,16 @@ GEM
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
shellany (0.0.1)
simplecov (0.14.1)
simplecov (0.15.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
simplecov-html (0.10.2)
slop (3.6.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
@@ -278,7 +283,7 @@ GEM
ref
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
tilt (2.0.8)
travis-lint (2.0.0)
json
turbolinks (5.0.1)
@@ -320,20 +325,20 @@ DEPENDENCIES
jquery-fileupload-rails
jquery-rails
launchy
minitest (= 5.10.1)
minitest
mysql2
poltergeist
powder
pry
pry-rails
rack-livereload
rails (= 5.0.1)
rails (= 5.1.4)
rails-perftest
rake
rb-fsevent
responders
rspec-rails
ruby-prof (= 0.15.9)
ruby-prof
sass-rails
simplecov
sqlite3
@@ -345,7 +350,7 @@ DEPENDENCIES
unicorn
RUBY VERSION
ruby 2.3.4p301
ruby 2.3.5p376
BUNDLED WITH
1.15.3
1.16.0.pre.2
README.md
+1 -1
View File
@@ -11,7 +11,7 @@ If you are looking for support or troubleshooting assistance, please visit our [
To begin, install the Ruby Version Manager (RVM):
```bash
$ curl -L https://get.rvm.io | bash -s stable --autolibs=3 --ruby=2.3.4
$ curl -L https://get.rvm.io | bash -s stable --autolibs=3 --ruby=2.3.5
```
After installing the package, clone this repo: