From c5b3de9a7620eae792966220709c4d5713aba62e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 13 Nov 2017 12:22:33 +0100 Subject: [PATCH] upgrade rails minor version --- CHANGELOG.md | 1 + Gemfile | 2 +- Gemfile.lock | 98 +++++++++++++++++++++++++++------------------------- 3 files changed, 53 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ade2b31e0..368a5347e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Fix a bug: creation of negative credits - Fix a bug: unable to display profiles of users whom any reservation is associated with a deleted object - Updated test data to allow passing test suite +- Upgraded rails minor version - [TODO DEPLOY] `rake db:migrate` ## v2.5.14 2017 September 12 diff --git a/Gemfile b/Gemfile index 5686d6664..c42cd438a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.5' +gem 'rails', '4.2.10' # Use SCSS for stylesheets gem 'sass-rails', '5.0.1' gem 'compass-rails', '2.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index e611da0fb..04d6e12a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,41 +14,40 @@ GEM specs: Ascii85 (1.0.2) aasm (4.1.0) - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) + rails-html-sanitizer (~> 1.0, >= 1.0.3) active_record_query_trace (1.4) - activejob (4.2.5) - activesupport (= 4.2.5) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.5) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) @@ -58,7 +57,7 @@ GEM api-pagination (4.3.0) apipie-rails (0.3.6) json - arel (6.0.3) + arel (6.0.4) autoprefixer-rails (5.1.8) execjs json @@ -126,6 +125,7 @@ GEM compass (~> 1.0.0) sass-rails (<= 5.0.1) sprockets (< 2.13) + concurrent-ruby (1.0.5) connection_pool (2.2.0) coveralls (0.8.16) json (>= 1.8, < 3) @@ -135,6 +135,7 @@ GEM tins (>= 1.6.0, < 2) crack (0.4.3) safe_yaml (~> 1.0.0) + crass (1.0.2) daemons (1.2.4) database_cleaner (1.4.1) debug_inspector (0.0.2) @@ -190,8 +191,8 @@ GEM forgery (0.6.0) friendly_id (5.1.0) activerecord (>= 4.0.0) - globalid (0.3.6) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) has_secure_token (1.0.0) activerecord (>= 3.0) hashdiff (0.3.0) @@ -209,7 +210,8 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.8.6) + i18n (0.9.1) + concurrent-ruby (~> 1.0) ice_nine (0.11.1) jbuilder (2.5.0) activesupport (>= 3.0.0, < 5.1) @@ -227,10 +229,11 @@ GEM activesupport (>= 3.0.0) kgio (2.9.3) libv8 (3.16.14.11) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.7.0) + mini_mime (>= 0.1.1) mailcatcher (0.6.5) eventmachine (= 1.0.9.1) mail (~> 2.3) @@ -243,17 +246,18 @@ GEM thread_safe (~> 0.3, >= 0.3.1) message_format (0.0.3) twitter_cldr (~> 3.1) - mime-types (2.99) + mime-types (2.99.3) mimemagic (0.3.2) mini_magick (4.2.0) - mini_portile2 (2.2.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) minitest (5.10.3) minitest-reporters (1.1.8) ansi builder minitest (>= 5.0) ruby-progressbar - multi_json (1.12.1) + multi_json (1.12.2) multi_xml (0.5.5) multipart-post (2.0.0) naught (1.0.0) @@ -265,8 +269,8 @@ GEM net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) netrc (0.10.3) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) notify_with (0.0.2) jbuilder (~> 2.0) rails (>= 4.2.0) @@ -310,16 +314,16 @@ GEM rack-test (0.6.3) rack (>= 1.0) railroady (1.4.0) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -336,13 +340,13 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.3) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (12.0.0) + rake (12.2.1) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -455,7 +459,7 @@ GEM cldr-plurals-runtime-rb (~> 1.0.0) json tzinfo - tzinfo (1.2.3) + tzinfo (1.2.4) thread_safe (~> 0.1) uglifier (2.7.1) execjs (>= 0.3.0) @@ -541,7 +545,7 @@ DEPENDENCIES puma pundit railroady - rails (= 4.2.5) + rails (= 4.2.10) rails-observers rails_12factor recurrence @@ -567,4 +571,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.15.4 + 1.16.0