From 6cd43698936eb2e08e01341c10f98b2123c07f6c Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Sun, 17 Mar 2019 11:17:21 +0100 Subject: [PATCH 1/2] Update rails --- Gemfile | 2 +- Gemfile.lock | 80 ++++++++++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Gemfile b/Gemfile index d53ad6e..692f8d8 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.2.2' +gem 'rails', '5.2.2.1' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.3.13' diff --git a/Gemfile.lock b/Gemfile.lock index c8fa98a..a18d0aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,43 +1,43 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.2) - actionpack (= 5.2.2) + actioncable (5.2.2.1) + actionpack (= 5.2.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) + actionmailer (5.2.2.1) + actionpack (= 5.2.2.1) + actionview (= 5.2.2.1) + activejob (= 5.2.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2) - actionview (= 5.2.2) - activesupport (= 5.2.2) + actionpack (5.2.2.1) + actionview (= 5.2.2.1) + activesupport (= 5.2.2.1) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.2) - activesupport (= 5.2.2) + actionview (5.2.2.1) + activesupport (= 5.2.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2) - activesupport (= 5.2.2) + activejob (5.2.2.1) + activesupport (= 5.2.2.1) globalid (>= 0.3.6) - activemodel (5.2.2) - activesupport (= 5.2.2) - activerecord (5.2.2) - activemodel (= 5.2.2) - activesupport (= 5.2.2) + activemodel (5.2.2.1) + activesupport (= 5.2.2.1) + activerecord (5.2.2.1) + activemodel (= 5.2.2.1) + activesupport (= 5.2.2.1) arel (>= 9.0) - activestorage (5.2.2) - actionpack (= 5.2.2) - activerecord (= 5.2.2) + activestorage (5.2.2.1) + actionpack (= 5.2.2.1) + activerecord (= 5.2.2.1) marcel (~> 0.3.1) - activesupport (5.2.2) + activesupport (5.2.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -69,7 +69,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) crass (1.0.4) devise (4.5.0) bcrypt (~> 3.0) @@ -89,7 +89,7 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) hashie (3.6.0) - i18n (0.9.5) + i18n (1.6.0) concurrent-ruby (~> 1.0) jbuilder (2.8.0) activesupport (>= 4.2.0) @@ -147,18 +147,18 @@ GEM rack (2.0.6) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2) - actioncable (= 5.2.2) - actionmailer (= 5.2.2) - actionpack (= 5.2.2) - actionview (= 5.2.2) - activejob (= 5.2.2) - activemodel (= 5.2.2) - activerecord (= 5.2.2) - activestorage (= 5.2.2) - activesupport (= 5.2.2) + rails (5.2.2.1) + actioncable (= 5.2.2.1) + actionmailer (= 5.2.2.1) + actionpack (= 5.2.2.1) + actionview (= 5.2.2.1) + activejob (= 5.2.2.1) + activemodel (= 5.2.2.1) + activerecord (= 5.2.2.1) + activestorage (= 5.2.2.1) + activesupport (= 5.2.2.1) bundler (>= 1.3.0) - railties (= 5.2.2) + railties (= 5.2.2.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -172,9 +172,9 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.2.2) - actionpack (= 5.2.2) - activesupport (= 5.2.2) + railties (5.2.2.1) + actionpack (= 5.2.2.1) + activesupport (= 5.2.2.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -209,7 +209,7 @@ GEM sqlite3 (1.3.13) sqlite3 (1.3.13-x64-mingw32) sqlite3 (1.3.13-x86-mingw32) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) turbolinks (5.2.0) @@ -256,7 +256,7 @@ DEPENDENCIES mysql2 (~> 0.5.2) omniauth omniauth-github - rails (= 5.2.2) + rails (= 5.2.2.1) rails-controller-testing rails-i18n (~> 5.1.3) sassc-rails (~> 2.1.0) From 55f1a42cef8b018b64bc2efcc9292bd97885c87b Mon Sep 17 00:00:00 2001 From: Philipp Fischbeck Date: Sun, 17 Mar 2019 11:40:16 +0100 Subject: [PATCH 2/2] Update used bundler version --- .travis.yml | 4 ++++ Gemfile.lock | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 864de30..aa88527 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,10 @@ rvm: - 2.5 - 2.4 - 2.3 +bundler_args: --without production +before_install: + - gem update --system + - gem install bundler script: - export RAILS_ENV=test - bundle exec rake db:schema:load diff --git a/Gemfile.lock b/Gemfile.lock index a18d0aa..4c441fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -271,4 +271,4 @@ DEPENDENCIES will_paginate-bootstrap (~> 1.0.1) BUNDLED WITH - 1.17.2 + 2.0.1