From dd16a24b97d0803c08af5f809912a724d57612da Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Mon, 18 Jun 2018 20:45:00 -0500 Subject: [PATCH] Update Rails to 4.2.10 --- Gemfile.lock | 108 ++++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a88e4ccc..6be17982 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,46 +13,45 @@ GEM specs: RedCloth (4.2.9) aasm (3.4.0) - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + 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.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + 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-xml_parser (1.0.1) actionpack (>= 4.0.0.rc1) - actionview (4.2.6) - activesupport (= 4.2.6) + 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) - activejob (4.2.6) - activesupport (= 4.2.6) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.6) + 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) acts_as_list (0.7.2) activerecord (>= 3.0) - arel (6.0.3) + arel (6.0.4) aruba (0.6.1) childprocess (>= 0.3.6) cucumber (>= 1.1.1) @@ -65,7 +64,7 @@ GEM bootstrap-sass (3.3.3) autoprefixer-rails (>= 5.0.0.1) sass (>= 3.2.19) - builder (3.2.2) + builder (3.2.3) bullet (4.14.0) activesupport (>= 3.0.0) uniform_notifier (>= 1.6.0) @@ -91,7 +90,7 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - concurrent-ruby (1.0.2) + concurrent-ruby (1.0.5) crass (0.2.1) cucumber (1.3.18) builder (>= 2.1.2) @@ -122,36 +121,38 @@ GEM sass (>= 3.2) gherkin (2.12.2) multi_json (~> 1.3) - globalid (0.3.6) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) htmlentities (4.3.3) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jaro_winkler (1.5.1) jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (2.1.0) libv8 (3.16.14.7) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) metaclass (0.0.4) method_source (0.8.2) - mime-types (2.99.2) + mime-types (2.99.3) mimemagic (0.3.0) - mini_portile2 (2.0.0) - minitest (5.9.0) + mini_mime (1.0.0) + mini_portile2 (2.1.0) + minitest (5.11.3) minitest-stub-const (0.5) mocha (1.1.0) metaclass (~> 0.0.1) multi_json (1.11.2) multi_test (0.1.1) mysql2 (0.3.20) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) nokogumbo (1.1.12) nokogiri paperclip (4.3.0) @@ -168,23 +169,23 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.6.4) + rack (1.6.10) rack-dev-mark (0.7.3) rack (>= 1.1) rack-mini-profiler (0.9.2) rack (>= 1.1.3) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + 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.6) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -192,13 +193,13 @@ GEM loofah (~> 2.0) rails_autolink (1.1.6) rails (> 3.1) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - rake (11.1.2) + rake (12.3.1) ref (1.0.5) rspec-expectations (3.1.2) diff-lcs (>= 1.2.0, < 2.0) @@ -239,10 +240,10 @@ GEM spring (1.1.3) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) - sprockets (3.6.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -257,13 +258,13 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) rack (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) + thor (0.20.0) + thread_safe (0.3.6) tilt (2.0.4) tolk (1.9.3) rails (>= 4.0, < 4.3) safe_yaml (>= 0.8.6) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -324,3 +325,6 @@ DEPENDENCIES uglifier (>= 1.3.0) will_paginate yard + +BUNDLED WITH + 1.16.1