Merge pull request #346 from jasnow/master

Upgraded Rails to 5.1.6 plus 11 gems along with Ruby to 2.5.1
This commit is contained in:
Ken Johnson
2018-04-15 11:00:32 -04:00
committed by GitHub
5 changed files with 52 additions and 51 deletions
+1 -1
View File
@@ -1 +1 @@
2.5.0 2.5.1
+2 -1
View File
@@ -1,8 +1,9 @@
language: ruby language: ruby
rvm: rvm:
- "2.5.0" - "2.5.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
View File
@@ -1,4 +1,4 @@
FROM ruby:2.5.0 FROM ruby:2.5.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
+2 -2
View File
@@ -2,9 +2,9 @@
source "https://rubygems.org" source "https://rubygems.org"
#don't upgrade #don't upgrade
gem "rails", "5.1.5" gem "rails", "5.1.6"
ruby "2.5.0" ruby "2.5.1"
gem "aruba" gem "aruba"
gem "bcrypt" gem "bcrypt"
+46 -46
View File
@@ -1,41 +1,41 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (5.1.5) actioncable (5.1.6)
actionpack (= 5.1.5) actionpack (= 5.1.6)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (~> 0.6.1) websocket-driver (~> 0.6.1)
actionmailer (5.1.5) actionmailer (5.1.6)
actionpack (= 5.1.5) actionpack (= 5.1.6)
actionview (= 5.1.5) actionview (= 5.1.6)
activejob (= 5.1.5) activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.1.5) actionpack (5.1.6)
actionview (= 5.1.5) actionview (= 5.1.6)
activesupport (= 5.1.5) activesupport (= 5.1.6)
rack (~> 2.0) rack (~> 2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.5) actionview (5.1.6)
activesupport (= 5.1.5) activesupport (= 5.1.6)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.5) activejob (5.1.6)
activesupport (= 5.1.5) activesupport (= 5.1.6)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.1.5) activemodel (5.1.6)
activesupport (= 5.1.5) activesupport (= 5.1.6)
activerecord (5.1.5) activerecord (5.1.6)
activemodel (= 5.1.5) activemodel (= 5.1.6)
activesupport (= 5.1.5) activesupport (= 5.1.6)
arel (~> 8.0) arel (~> 8.0)
activesupport (5.1.5) activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.5.2) addressable (2.5.2)
@@ -49,7 +49,7 @@ GEM
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.1) backports (3.11.2)
bcrypt (3.1.11) bcrypt (3.1.11)
better_errors (2.4.0) better_errors (2.4.0)
coderay (>= 1.0.0) coderay (>= 1.0.0)
@@ -82,7 +82,7 @@ GEM
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
contracts (0.16.0) contracts (0.16.0)
crass (1.0.3) crass (1.0.4)
cucumber (3.1.0) cucumber (3.1.0)
builder (>= 2.1.2) builder (>= 2.1.2)
cucumber-core (~> 3.1.0) cucumber-core (~> 3.1.0)
@@ -96,7 +96,7 @@ GEM
backports (>= 3.8.0) backports (>= 3.8.0)
cucumber-tag_expressions (~> 1.1.0) cucumber-tag_expressions (~> 1.1.0)
gherkin (>= 5.0.0) gherkin (>= 5.0.0)
cucumber-expressions (5.0.13) cucumber-expressions (5.0.17)
cucumber-tag_expressions (1.1.1) cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1) cucumber-wire (0.0.1)
database_cleaner (1.6.2) database_cleaner (1.6.2)
@@ -142,7 +142,7 @@ 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 (0.9.5) i18n (1.0.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jquery-fileupload-rails (0.4.7) jquery-fileupload-rails (0.4.7)
actionpack (>= 3.1) actionpack (>= 3.1)
@@ -164,7 +164,7 @@ GEM
loofah (2.2.2) loofah (2.2.2)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.12) lumberjack (1.0.13)
mail (2.7.0) mail (2.7.0)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
method_source (0.9.0) method_source (0.9.0)
@@ -173,7 +173,7 @@ GEM
minitest (5.11.3) minitest (5.11.3)
multi_json (1.13.1) multi_json (1.13.1)
multi_test (0.1.2) multi_test (0.1.2)
mysql2 (0.5.0) mysql2 (0.5.1)
nenv (0.3.0) nenv (0.3.0)
nio4r (2.3.0) nio4r (2.3.0)
nokogiri (1.8.2) nokogiri (1.8.2)
@@ -182,7 +182,7 @@ GEM
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
parallel (1.12.1) parallel (1.12.1)
parser (2.5.0.5) parser (2.5.1.0)
ast (~> 2.4.0) ast (~> 2.4.0)
poltergeist (1.17.0) poltergeist (1.17.0)
capybara (~> 2.1) capybara (~> 2.1)
@@ -199,21 +199,21 @@ GEM
pry (>= 0.10.4) pry (>= 0.10.4)
public_suffix (3.0.2) public_suffix (3.0.2)
rack (2.0.4) rack (2.0.4)
rack-livereload (0.3.16) rack-livereload (0.3.17)
rack rack
rack-test (0.8.3) rack-test (1.0.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.1.5) rails (5.1.6)
actioncable (= 5.1.5) actioncable (= 5.1.6)
actionmailer (= 5.1.5) actionmailer (= 5.1.6)
actionpack (= 5.1.5) actionpack (= 5.1.6)
actionview (= 5.1.5) actionview (= 5.1.6)
activejob (= 5.1.5) activejob (= 5.1.6)
activemodel (= 5.1.5) activemodel (= 5.1.6)
activerecord (= 5.1.5) activerecord (= 5.1.6)
activesupport (= 5.1.5) activesupport (= 5.1.6)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.1.5) railties (= 5.1.6)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
@@ -221,9 +221,9 @@ GEM
rails-html-sanitizer (1.0.4) rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2) loofah (~> 2.2, >= 2.2.2)
rails-perftest (0.0.7) rails-perftest (0.0.7)
railties (5.1.5) railties (5.1.6)
actionpack (= 5.1.5) actionpack (= 5.1.6)
activesupport (= 5.1.5) activesupport (= 5.1.6)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
@@ -305,12 +305,12 @@ GEM
tilt (2.0.8) tilt (2.0.8)
travis-lint (2.0.0) travis-lint (2.0.0)
json json
turbolinks (5.1.0) turbolinks (5.1.1)
turbolinks-source (~> 5.1) turbolinks-source (~> 5.1)
turbolinks-source (5.1.0) turbolinks-source (5.1.0)
tzinfo (1.2.5) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (4.1.8) uglifier (4.1.9)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.0) unicode-display_width (1.3.0)
unicorn (5.4.0) unicorn (5.4.0)
@@ -351,7 +351,7 @@ DEPENDENCIES
pry pry
pry-rails pry-rails
rack-livereload rack-livereload
rails (= 5.1.5) rails (= 5.1.6)
rails-perftest rails-perftest
rake rake
rb-fsevent rb-fsevent
@@ -370,7 +370,7 @@ DEPENDENCIES
unicorn unicorn
RUBY VERSION RUBY VERSION
ruby 2.5.0p0 ruby 2.5.1p57
BUNDLED WITH BUNDLED WITH
1.16.1 1.16.1