From 822db470149faab2ada572635ab48bb078240bcf Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 3 Apr 2018 00:23:39 +0200 Subject: [PATCH] Upgrade to rails 5.1.5 and ruby 2.4.2. --- .ruby-version | 2 +- Gemfile | 4 +-- Gemfile.lock | 86 +++++++++++++++++++++++++-------------------------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.ruby-version b/.ruby-version index 8e8299dcc..79a614418 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.2 +2.4.4 diff --git a/Gemfile b/Gemfile index da0becb45..e32e88837 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' # core - base -ruby '2.4.2' -gem 'rails', '5.1.4' +ruby '2.4.4' +gem 'rails', '5.1.5' # core - rails additions gem 'activerecord-session_store' diff --git a/Gemfile.lock b/Gemfile.lock index 43ae0074c..0050ed48e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,37 +17,37 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.1.4) - actionpack (= 5.1.4) + actioncable (5.1.5) + actionpack (= 5.1.5) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) + actionmailer (5.1.5) + actionpack (= 5.1.5) + actionview (= 5.1.5) + activejob (= 5.1.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.4) - actionview (= 5.1.4) - activesupport (= 5.1.4) + actionpack (5.1.5) + actionview (= 5.1.5) + activesupport (= 5.1.5) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.4) - activesupport (= 5.1.4) + actionview (5.1.5) + activesupport (= 5.1.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.4) - activesupport (= 5.1.4) + activejob (5.1.5) + activesupport (= 5.1.5) globalid (>= 0.3.6) - activemodel (5.1.4) - activesupport (= 5.1.4) - activerecord (5.1.4) - activemodel (= 5.1.4) - activesupport (= 5.1.4) + activemodel (5.1.5) + activesupport (= 5.1.5) + activerecord (5.1.5) + activemodel (= 5.1.5) + activesupport (= 5.1.5) arel (~> 8.0) activerecord-nulldb-adapter (0.3.7) activerecord (>= 2.0.0) @@ -57,7 +57,7 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 1.5.2, < 3) railties (>= 4.0, < 5.2) - activesupport (5.1.4) + activesupport (5.1.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -129,7 +129,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) equalizer (0.0.11) - erubi (1.7.0) + erubi (1.7.1) eventmachine (1.2.5) execjs (2.7.0) factory_bot (4.8.2) @@ -189,7 +189,7 @@ GEM http-form_data (2.0.0) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (0.9.1) + i18n (0.9.5) concurrent-ruby (~> 1.0) icalendar (2.4.1) icalendar-recurrence (1.1.2) @@ -224,7 +224,7 @@ GEM method_source (0.9.0) mime-types (2.99.3) mini_portile2 (2.3.0) - minitest (5.10.3) + minitest (5.11.3) multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) @@ -234,7 +234,7 @@ GEM nestful (1.1.3) net-ldap (0.16.1) netrc (0.11.0) - nio4r (2.1.0) + nio4r (2.3.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) nori (2.6.0) @@ -298,22 +298,22 @@ GEM method_source (~> 0.9.0) public_suffix (3.0.1) puma (3.11.0) - rack (2.0.3) + rack (2.0.4) rack-livereload (0.3.16) rack - rack-test (0.8.2) + rack-test (1.0.0) rack (>= 1.0, < 3) - rails (5.1.4) - actioncable (= 5.1.4) - actionmailer (= 5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) - activemodel (= 5.1.4) - activerecord (= 5.1.4) - activesupport (= 5.1.4) + rails (5.1.5) + actioncable (= 5.1.5) + actionmailer (= 5.1.5) + actionpack (= 5.1.5) + actionview (= 5.1.5) + activejob (= 5.1.5) + activemodel (= 5.1.5) + activerecord (= 5.1.5) + activesupport (= 5.1.5) bundler (>= 1.3.0) - railties (= 5.1.4) + railties (= 5.1.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -322,16 +322,16 @@ GEM loofah (~> 2.2, >= 2.2.2) rails-observers (0.1.5) activemodel (>= 4.0) - railties (5.1.4) - actionpack (= 5.1.4) - activesupport (= 5.1.4) + railties (5.1.5) + actionpack (= 5.1.5) + activesupport (= 5.1.5) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.19.0) - rake (12.3.0) + rake (12.3.1) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -428,7 +428,7 @@ GEM multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -519,7 +519,7 @@ DEPENDENCIES pre-commit puma rack-livereload - rails (= 5.1.4) + rails (= 5.1.5) rails-observers rb-fsevent rspec-rails @@ -545,7 +545,7 @@ DEPENDENCIES zendesk_api RUBY VERSION - ruby 2.4.2p198 + ruby 2.4.4p296 BUNDLED WITH - 1.16.0 + 1.16.1