Merge pull request #359 from jasnow/master
Upgraded 20 gems + Ruby plus pinned sqlite3 gem to avoid upgrade issue
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
|||||||
2.5.3
|
2.6.1
|
||||||
|
|||||||
+1
-2
@@ -1,9 +1,8 @@
|
|||||||
language: ruby
|
language: ruby
|
||||||
rvm:
|
rvm:
|
||||||
- "2.5.3"
|
- "2.6.1"
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- "gem install bundler"
|
|
||||||
- "phantomjs --version"
|
- "phantomjs --version"
|
||||||
- "export PATH=${PWD}/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:${PATH}"
|
- "export PATH=${PWD}/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:${PATH}"
|
||||||
- "phantomjs --version"
|
- "phantomjs --version"
|
||||||
|
|||||||
+1
-1
@@ -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 apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
|
||||||
RUN mkdir /myapp
|
RUN mkdir /myapp
|
||||||
WORKDIR /myapp
|
WORKDIR /myapp
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ source "https://rubygems.org"
|
|||||||
#don't upgrade
|
#don't upgrade
|
||||||
gem "rails", "5.1.6.1"
|
gem "rails", "5.1.6.1"
|
||||||
|
|
||||||
ruby "2.5.3"
|
ruby "2.6.1"
|
||||||
|
|
||||||
gem "aruba"
|
gem "aruba"
|
||||||
gem "bcrypt"
|
gem "bcrypt"
|
||||||
@@ -23,7 +23,7 @@ gem "responders" #For Rails 4.2 # LOCKED DOWN
|
|||||||
gem "ruby-prof"
|
gem "ruby-prof"
|
||||||
gem "sass-rails"
|
gem "sass-rails"
|
||||||
gem "simplecov", require: false, group: :test
|
gem "simplecov", require: false, group: :test
|
||||||
gem "sqlite3"
|
gem "sqlite3", "1.3.13" # 2/7/2019: LOCKED DOWN
|
||||||
gem "therubyracer"
|
gem "therubyracer"
|
||||||
gem "turbolinks"
|
gem "turbolinks"
|
||||||
gem "uglifier"
|
gem "uglifier"
|
||||||
|
|||||||
+28
-28
@@ -38,31 +38,31 @@ GEM
|
|||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.5.2)
|
addressable (2.6.0)
|
||||||
public_suffix (>= 2.0.2, < 4.0)
|
public_suffix (>= 2.0.2, < 4.0)
|
||||||
arel (8.0.0)
|
arel (8.0.0)
|
||||||
aruba (0.14.6)
|
aruba (0.14.8)
|
||||||
childprocess (>= 0.6.3, < 0.10.0)
|
childprocess (>= 0.6.3, < 1.1.0)
|
||||||
contracts (~> 0.9)
|
contracts (~> 0.9)
|
||||||
cucumber (>= 1.3.19)
|
cucumber (>= 1.3.19)
|
||||||
ffi (~> 1.9.10)
|
ffi (~> 1.9)
|
||||||
rspec-expectations (>= 2.99)
|
rspec-expectations (>= 2.99)
|
||||||
thor (~> 0.19)
|
thor (~> 0.19)
|
||||||
ast (2.4.0)
|
ast (2.4.0)
|
||||||
backports (3.11.4)
|
backports (3.11.4)
|
||||||
bcrypt (3.1.12)
|
bcrypt (3.1.12)
|
||||||
better_errors (2.5.0)
|
better_errors (2.5.1)
|
||||||
coderay (>= 1.0.0)
|
coderay (>= 1.0.0)
|
||||||
erubi (>= 1.0.0)
|
erubi (>= 1.0.0)
|
||||||
rack (>= 0.9.0)
|
rack (>= 0.9.0)
|
||||||
binding_of_caller (0.8.0)
|
binding_of_caller (0.8.0)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
brakeman (4.3.1)
|
brakeman (4.4.0)
|
||||||
builder (3.2.3)
|
builder (3.2.3)
|
||||||
bundler-audit (0.6.0)
|
bundler-audit (0.6.1)
|
||||||
bundler (~> 1.2)
|
bundler (>= 1.2.0, < 3)
|
||||||
thor (~> 0.18)
|
thor (~> 0.18)
|
||||||
capybara (3.12.0)
|
capybara (3.13.2)
|
||||||
addressable
|
addressable
|
||||||
mini_mime (>= 0.1.3)
|
mini_mime (>= 0.1.3)
|
||||||
nokogiri (~> 1.8)
|
nokogiri (~> 1.8)
|
||||||
@@ -70,8 +70,8 @@ GEM
|
|||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
regexp_parser (~> 1.2)
|
regexp_parser (~> 1.2)
|
||||||
xpath (~> 3.2)
|
xpath (~> 3.2)
|
||||||
childprocess (0.9.0)
|
childprocess (1.0.1)
|
||||||
ffi (~> 1.0, >= 1.0.11)
|
rake (< 13.0)
|
||||||
cliver (0.3.2)
|
cliver (0.3.2)
|
||||||
coderay (1.1.2)
|
coderay (1.1.2)
|
||||||
coffee-rails (4.2.2)
|
coffee-rails (4.2.2)
|
||||||
@@ -115,7 +115,7 @@ GEM
|
|||||||
thor (~> 0.19.1)
|
thor (~> 0.19.1)
|
||||||
formatador (0.2.5)
|
formatador (0.2.5)
|
||||||
gherkin (5.1.0)
|
gherkin (5.1.0)
|
||||||
globalid (0.4.1)
|
globalid (0.4.2)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
guard (2.15.0)
|
guard (2.15.0)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
@@ -143,9 +143,9 @@ GEM
|
|||||||
guard (>= 2.0.0)
|
guard (>= 2.0.0)
|
||||||
guard-compat (~> 1.0)
|
guard-compat (~> 1.0)
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
i18n (1.3.0)
|
i18n (1.5.3)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
jaro_winkler (1.5.1)
|
jaro_winkler (1.5.2)
|
||||||
jquery-fileupload-rails (1.0.0)
|
jquery-fileupload-rails (1.0.0)
|
||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
@@ -178,13 +178,13 @@ GEM
|
|||||||
mysql2 (0.5.2)
|
mysql2 (0.5.2)
|
||||||
nenv (0.3.0)
|
nenv (0.3.0)
|
||||||
nio4r (2.3.1)
|
nio4r (2.3.1)
|
||||||
nokogiri (1.9.1)
|
nokogiri (1.10.1)
|
||||||
mini_portile2 (~> 2.4.0)
|
mini_portile2 (~> 2.4.0)
|
||||||
notiffany (0.1.1)
|
notiffany (0.1.1)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
shellany (~> 0.0)
|
shellany (~> 0.0)
|
||||||
parallel (1.12.1)
|
parallel (1.13.0)
|
||||||
parser (2.5.3.0)
|
parser (2.6.0.0)
|
||||||
ast (~> 2.4.0)
|
ast (~> 2.4.0)
|
||||||
poltergeist (1.18.1)
|
poltergeist (1.18.1)
|
||||||
capybara (>= 2.1, < 4)
|
capybara (>= 2.1, < 4)
|
||||||
@@ -197,7 +197,7 @@ GEM
|
|||||||
pry (0.12.2)
|
pry (0.12.2)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.9.0)
|
method_source (~> 0.9.0)
|
||||||
pry-rails (0.3.8)
|
pry-rails (0.3.9)
|
||||||
pry (>= 0.10.4)
|
pry (>= 0.10.4)
|
||||||
public_suffix (3.0.3)
|
public_suffix (3.0.3)
|
||||||
puma (3.12.0)
|
puma (3.12.0)
|
||||||
@@ -238,9 +238,9 @@ GEM
|
|||||||
ffi (~> 1.0)
|
ffi (~> 1.0)
|
||||||
ref (2.0.0)
|
ref (2.0.0)
|
||||||
regexp_parser (1.3.0)
|
regexp_parser (1.3.0)
|
||||||
responders (2.4.0)
|
responders (2.4.1)
|
||||||
actionpack (>= 4.2.0, < 5.3)
|
actionpack (>= 4.2.0, < 6.0)
|
||||||
railties (>= 4.2.0, < 5.3)
|
railties (>= 4.2.0, < 6.0)
|
||||||
rspec (3.8.0)
|
rspec (3.8.0)
|
||||||
rspec-core (~> 3.8.0)
|
rspec-core (~> 3.8.0)
|
||||||
rspec-expectations (~> 3.8.0)
|
rspec-expectations (~> 3.8.0)
|
||||||
@@ -253,7 +253,7 @@ GEM
|
|||||||
rspec-mocks (3.8.0)
|
rspec-mocks (3.8.0)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
rspec-support (~> 3.8.0)
|
rspec-support (~> 3.8.0)
|
||||||
rspec-rails (3.8.1)
|
rspec-rails (3.8.2)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
railties (>= 3.0)
|
railties (>= 3.0)
|
||||||
@@ -262,7 +262,7 @@ GEM
|
|||||||
rspec-mocks (~> 3.8.0)
|
rspec-mocks (~> 3.8.0)
|
||||||
rspec-support (~> 3.8.0)
|
rspec-support (~> 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)
|
jaro_winkler (~> 1.5.1)
|
||||||
parallel (~> 1.10)
|
parallel (~> 1.10)
|
||||||
parser (>= 2.5, != 2.5.1.1)
|
parser (>= 2.5, != 2.5.1.1)
|
||||||
@@ -275,7 +275,7 @@ GEM
|
|||||||
ruby-prof (0.17.0)
|
ruby-prof (0.17.0)
|
||||||
ruby-progressbar (1.10.0)
|
ruby-progressbar (1.10.0)
|
||||||
ruby_dep (1.5.0)
|
ruby_dep (1.5.0)
|
||||||
sass (3.7.2)
|
sass (3.7.3)
|
||||||
sass-listen (~> 4.0.0)
|
sass-listen (~> 4.0.0)
|
||||||
sass-listen (4.0.0)
|
sass-listen (4.0.0)
|
||||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
@@ -303,7 +303,7 @@ GEM
|
|||||||
activesupport (>= 4.0)
|
activesupport (>= 4.0)
|
||||||
sprockets (>= 3.0.0)
|
sprockets (>= 3.0.0)
|
||||||
sqlite3 (1.3.13)
|
sqlite3 (1.3.13)
|
||||||
test-unit (3.2.9)
|
test-unit (3.3.0)
|
||||||
power_assert
|
power_assert
|
||||||
therubyracer (0.12.3)
|
therubyracer (0.12.3)
|
||||||
libv8 (~> 3.16.14.15)
|
libv8 (~> 3.16.14.15)
|
||||||
@@ -370,7 +370,7 @@ DEPENDENCIES
|
|||||||
ruby-prof
|
ruby-prof
|
||||||
sass-rails
|
sass-rails
|
||||||
simplecov
|
simplecov
|
||||||
sqlite3
|
sqlite3 (= 1.3.13)
|
||||||
test-unit
|
test-unit
|
||||||
therubyracer
|
therubyracer
|
||||||
travis-lint
|
travis-lint
|
||||||
@@ -379,7 +379,7 @@ DEPENDENCIES
|
|||||||
unicorn
|
unicorn
|
||||||
|
|
||||||
RUBY VERSION
|
RUBY VERSION
|
||||||
ruby 2.5.3p105
|
ruby 2.6.1p33
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.17.2
|
1.17.3
|
||||||
|
|||||||
Reference in New Issue
Block a user