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

Merge pull request #359 from jasnow/master

Browse Source 
Upgraded 20 gems + Ruby plus pinned sqlite3 gem to avoid upgrade issue
This commit is contained in:
Ken Johnson
2019-02-15 09:43:59 -05:00
committed by GitHub
parent 4e466f34c8 c002bb4ccf
commit b864361445
5 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ruby-version
+1 -1
View File
@@ -1 +1 @@
2.5.3
2.6.1
.travis.yml
+1 -2
View File
@@ -1,9 +1,8 @@
language: ruby
rvm:
- "2.5.3"
- "2.6.1"
before_install:
- "gem install bundler"
- "phantomjs --version"
- "export PATH=${PWD}/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:${PATH}"
- "phantomjs --version"
Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ruby:2.5.3
FROM ruby:2.6.1
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", "5.1.6.1"
ruby "2.5.3"
ruby "2.6.1"
gem "aruba"
gem "bcrypt"
@@ -23,7 +23,7 @@ gem "responders" #For Rails 4.2 # LOCKED DOWN
gem "ruby-prof"
gem "sass-rails"
gem "simplecov", require: false, group: :test
gem "sqlite3"
gem "sqlite3", "1.3.13" # 2/7/2019: LOCKED DOWN
gem "therubyracer"
gem "turbolinks"
gem "uglifier"
Gemfile.lock
+28 -28
View File
@@ -38,31 +38,31 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
arel (8.0.0)
aruba (0.14.6)
childprocess (>= 0.6.3, < 0.10.0)
aruba (0.14.8)
childprocess (>= 0.6.3, < 1.1.0)
contracts (~> 0.9)
cucumber (>= 1.3.19)
ffi (~> 1.9.10)
ffi (~> 1.9)
rspec-expectations (>= 2.99)
thor (~> 0.19)
ast (2.4.0)
backports (3.11.4)
bcrypt (3.1.12)
better_errors (2.5.0)
better_errors (2.5.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
brakeman (4.3.1)
brakeman (4.4.0)
builder (3.2.3)
bundler-audit (0.6.0)
bundler (~> 1.2)
bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3)
thor (~> 0.18)
capybara (3.12.0)
capybara (3.13.2)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@@ -70,8 +70,8 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
xpath (~> 3.2)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
childprocess (1.0.1)
rake (< 13.0)
cliver (0.3.2)
coderay (1.1.2)
coffee-rails (4.2.2)
@@ -115,7 +115,7 @@ GEM
thor (~> 0.19.1)
formatador (0.2.5)
gherkin (5.1.0)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.15.0)
formatador (>= 0.2.4)
@@ -143,9 +143,9 @@ GEM
guard (>= 2.0.0)
guard-compat (~> 1.0)
http_parser.rb (0.6.0)
i18n (1.3.0)
i18n (1.5.3)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.1)
jaro_winkler (1.5.2)
jquery-fileupload-rails (1.0.0)
actionpack (>= 3.1)
railties (>= 3.1)
@@ -178,13 +178,13 @@ GEM
mysql2 (0.5.2)
nenv (0.3.0)
nio4r (2.3.1)
nokogiri (1.9.1)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
parallel (1.12.1)
parser (2.5.3.0)
parallel (1.13.0)
parser (2.6.0.0)
ast (~> 2.4.0)
poltergeist (1.18.1)
capybara (>= 2.1, < 4)
@@ -197,7 +197,7 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.8)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.0)
@@ -238,9 +238,9 @@ GEM
ffi (~> 1.0)
ref (2.0.0)
regexp_parser (1.3.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@@ -253,7 +253,7 @@ GEM
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.1)
rspec-rails (3.8.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -262,7 +262,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.61.1)
rubocop (0.64.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
@@ -275,7 +275,7 @@ GEM
ruby-prof (0.17.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
sass (3.7.2)
sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -303,7 +303,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
test-unit (3.2.9)
test-unit (3.3.0)
power_assert
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
@@ -370,7 +370,7 @@ DEPENDENCIES
ruby-prof
sass-rails
simplecov
sqlite3
sqlite3 (= 1.3.13)
test-unit
therubyracer
travis-lint
@@ -379,7 +379,7 @@ DEPENDENCIES
unicorn
RUBY VERSION
ruby 2.5.3p105
ruby 2.6.1p33
BUNDLED WITH
1.17.2
1.17.3