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

Merge pull request #371 from jasnow/master

Browse Source 
Should fix Issue #370
This commit is contained in:
Ken Johnson
2019-11-06 05:01:43 +11:00
committed by GitHub
parent df7c4efca9 4297f5b57c
commit 70d41440c4
6 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ruby-version
+1 -1
View File
@@ -1 +1 @@
2.7.0-preview1
2.6.5
.travis.yml
+1 -1
View File
@@ -1,6 +1,6 @@
language: ruby
rvm:
- "2.7.0-preview1"
- "2.6.5"
before_install:
- "phantomjs --version"
Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ruby:2.7.0-preview1
FROM ruby:2.6.5
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
RUN mkdir /myapp
WORKDIR /myapp
Gemfile
+2 -2
View File
@@ -4,7 +4,7 @@ source "https://rubygems.org"
#don't upgrade
gem "rails", "6.0.0"
ruby "2.7.0"
ruby "2.6.5"
gem "aruba"
gem "bcrypt"
@@ -52,7 +52,7 @@ group :development, :test, :mysql do
gem "database_cleaner"
gem "launchy"
gem "poltergeist"
gem "rspec-rails", '4.0.0.beta2' # 4/26/2019: LOCKED DOWN
gem "rspec-rails", '4.0.0.beta3' # 4/26/2019: LOCKED DOWN
gem "test-unit"
end
Gemfile.lock
+35 -40
View File
@@ -98,7 +98,7 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
contracts (0.16.0)
crass (1.0.4)
crass (1.0.5)
cucumber (3.1.2)
builder (>= 2.1.2)
cucumber-core (~> 3.2.0)
@@ -119,7 +119,6 @@ GEM
debug_inspector (0.0.3)
diff-lcs (1.3)
docile (1.3.2)
dotenv (0.7.0)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
@@ -127,14 +126,12 @@ GEM
eventmachine (1.2.7)
execjs (2.7.0)
ffi (1.11.1)
foreman (0.64.0)
dotenv (~> 0.7.0)
thor (>= 0.13.6)
foreman (0.86.0)
formatador (0.2.5)
gherkin (5.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.1)
guard (2.16.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
@@ -157,9 +154,9 @@ GEM
guard (>= 2.0.0)
guard-compat (~> 1.0)
http_parser.rb (0.6.0)
i18n (1.6.0)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.3)
jaro_winkler (1.5.4)
jquery-fileupload-rails (1.0.0)
actionpack (>= 3.1)
railties (>= 3.1)
@@ -173,11 +170,10 @@ GEM
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.19)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.3.0)
listen (3.2.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
@@ -189,19 +185,19 @@ GEM
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
multi_json (1.13.1)
minitest (5.13.0)
multi_json (1.14.1)
multi_test (0.1.2)
mysql2 (0.5.2)
nenv (0.3.0)
nio4r (2.5.2)
nokogiri (1.10.4)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
parallel (1.17.0)
parser (2.6.4.1)
parallel (1.18.0)
parser (2.6.5.0)
ast (~> 2.4.0)
poltergeist (1.18.1)
capybara (>= 2.1, < 4)
@@ -216,7 +212,7 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.1)
puma (4.2.0)
puma (4.2.1)
nio4r (~> 2.0)
rack (2.0.7)
rack-livereload (0.3.17)
@@ -241,8 +237,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-perftest (0.0.7)
railties (6.0.0)
actionpack (= 6.0.0)
@@ -261,19 +257,19 @@ GEM
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.1)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (4.0.0.beta2)
rspec-support (~> 3.9.0)
rspec-rails (4.0.0.beta3)
actionpack (>= 4.2)
activesupport (>= 4.2)
railties (>= 4.2)
@@ -281,8 +277,8 @@ GEM
rspec-expectations (~> 3.8)
rspec-mocks (~> 3.8)
rspec-support (~> 3.8)
rspec-support (3.8.2)
rubocop (0.75.0)
rspec-support (3.9.0)
rubocop (0.76.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
@@ -296,7 +292,6 @@ GEM
rubocop (>= 0.68.0)
ruby-prof (1.0.0)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
sassc (2.2.1)
ffi (~> 1.9)
sassc-rails (2.1.2)
@@ -311,7 +306,7 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sprockets (3.7.2)
sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
@@ -345,7 +340,7 @@ GEM
websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.1.10)
zeitwerk (2.2.1)
PLATFORMS
ruby
@@ -380,7 +375,7 @@ DEPENDENCIES
rake
rb-fsevent
responders
rspec-rails (= 4.0.0.beta2)
rspec-rails (= 4.0.0.beta3)
rubocop-github
ruby-prof
sassc-rails
@@ -394,7 +389,7 @@ DEPENDENCIES
unicorn
RUBY VERSION
ruby 2.7.0p-1
ruby 2.6.5p114
BUNDLED WITH
2.1.0.pre.1
1.17.3
app/assets/config/manifest.js
+3
View File
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css