From f4b8e737f0812cf42b473ebbd580cc37f100e7eb Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Thu, 3 Sep 2015 14:27:54 +0900 Subject: [PATCH] Upgrade rails to 4.2.4 --- Gemfile | 2 +- Gemfile.lock | 78 ++++++++++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Gemfile b/Gemfile index dbd107e055..10532109ff 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,7 @@ gem 'mysql2', '~> 0.3.16' gem 'multi_xml' gem 'nokogiri', '~> 1.6.4' gem 'omniauth' -gem 'rails' , '4.2.2' +gem 'rails', '4.2.4' gem 'rufus-scheduler', '~> 3.0.8', require: false gem 'sass-rails', '~> 5.0.3' gem 'select2-rails', '~> 3.5.4' diff --git a/Gemfile.lock b/Gemfile.lock index b1beb5056f..8a9e0d5ec6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,43 +54,43 @@ GEM remote: https://rubygems.org/ specs: ace-rails-ap (2.0.1) - actionmailer (4.2.2) - actionpack (= 4.2.2) - actionview (= 4.2.2) - activejob (= 4.2.2) + actionmailer (4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.2) - actionview (= 4.2.2) - activesupport (= 4.2.2) + actionpack (4.2.4) + actionview (= 4.2.4) + activesupport (= 4.2.4) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.2) - activesupport (= 4.2.2) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.2) - activesupport (= 4.2.2) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.4) + activesupport (= 4.2.4) globalid (>= 0.3.0) - activemodel (4.2.2) - activesupport (= 4.2.2) + activemodel (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) - activerecord (4.2.2) - activemodel (= 4.2.2) - activesupport (= 4.2.2) + activerecord (4.2.4) + activemodel (= 4.2.4) + activesupport (= 4.2.4) arel (~> 6.0) - activesupport (4.2.2) + activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.3.8) - arel (6.0.0) + arel (6.0.3) autoparse (0.3.3) addressable (>= 2.3.1) extlib (>= 0.9.15) @@ -204,7 +204,7 @@ GEM geokit-rails (2.0.1) geokit (~> 1.5) rails (>= 3.0) - globalid (0.3.5) + globalid (0.3.6) activesupport (>= 4.1.0) google-api-client (0.7.1) addressable (>= 2.3.2) @@ -276,7 +276,7 @@ GEM celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - loofah (2.0.2) + loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.9) macaddr (1.7.1) @@ -289,7 +289,7 @@ GEM mime-types (2.6.1) mini_magick (4.2.3) mini_portile (0.6.2) - minitest (5.7.0) + minitest (5.8.0) mqtt (0.3.1) multi_json (1.11.2) multi_xml (0.5.5) @@ -347,20 +347,20 @@ GEM rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.2) - actionmailer (= 4.2.2) - actionpack (= 4.2.2) - actionview (= 4.2.2) - activejob (= 4.2.2) - activemodel (= 4.2.2) - activerecord (= 4.2.2) - activesupport (= 4.2.2) + rails (4.2.4) + actionmailer (= 4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) + activemodel (= 4.2.4) + activerecord (= 4.2.4) + activesupport (= 4.2.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.2) + railties (= 4.2.4) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) @@ -371,9 +371,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.3) - railties (4.2.2) - actionpack (= 4.2.2) - activesupport (= 4.2.2) + railties (4.2.4) + actionpack (= 4.2.4) + activesupport (= 4.2.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -452,9 +452,9 @@ GEM slop (3.6.0) spectrum-rails (1.3.4) railties (>= 3.1) - sprockets (3.2.0) + sprockets (3.3.4) rack (~> 1.0) - sprockets-rails (2.3.1) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -584,7 +584,7 @@ DEPENDENCIES pry-rails quiet_assets rack (> 1.5.0) - rails (= 4.2.2) + rails (= 4.2.4) rails_12factor rr rspec (~> 3.2)