From 150068c4a25e6316400e7494fbe32eef41dac88a Mon Sep 17 00:00:00 2001 From: yoshihara Date: Thu, 2 Apr 2015 14:22:59 +0900 Subject: [PATCH] Update rails to 4.2 in gemspec refs #161 I tried it --- Gemfile.lock | 106 +++++++++++++++++++++++++++------------------ fluentd-ui.gemspec | 2 +- 2 files changed, 64 insertions(+), 44 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 35484c3..69c3c73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,7 +15,7 @@ PATH kramdown (> 1.0.0) kramdown-haml puma - rails (~> 4.1.7) + rails (~> 4.2.0) rubyzip (~> 1.1) sass-rails (~> 4.0.3) settingslogic @@ -25,34 +25,43 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.9) - actionpack (= 4.1.9) - actionview (= 4.1.9) + actionmailer (4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.9) - actionview (= 4.1.9) - activesupport (= 4.1.9) - rack (~> 1.5.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.1) + actionview (= 4.2.1) + activesupport (= 4.2.1) + rack (~> 1.6) rack-test (~> 0.6.2) - actionview (4.1.9) - activesupport (= 4.1.9) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.1) + activesupport (= 4.2.1) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.9) - activesupport (= 4.1.9) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activejob (4.2.1) + activesupport (= 4.2.1) + globalid (>= 0.3.0) + activemodel (4.2.1) + activesupport (= 4.2.1) builder (~> 3.1) - activerecord (4.1.9) - activemodel (= 4.1.9) - activesupport (= 4.1.9) - arel (~> 5.0.0) - activesupport (4.1.9) - i18n (~> 0.6, >= 0.6.9) + activerecord (4.2.1) + activemodel (= 4.2.1) + activesupport (= 4.2.1) + arel (~> 6.0) + activesupport (4.2.1) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.6) - arel (5.0.1.20140414130214) + addressable (2.3.8) + arel (6.0.0) builder (3.2.2) capybara (2.4.4) mime-types (>= 1.16) @@ -60,15 +69,13 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.4) + capybara-screenshot (1.0.7) capybara (>= 1.0, < 3) - colored launchy celluloid (0.15.2) timers (~> 1.1.0) cliver (0.3.2) coderay (1.1.0) - colored (1.2) cool.io (1.3.0) crack (0.4.2) safe_yaml (~> 1.0.0) @@ -99,6 +106,8 @@ GEM yajl-ruby (~> 1.0) font-awesome-rails (4.3.0.0) railties (>= 3.2, < 5.0) + globalid (0.3.3) + activesupport (>= 4.1.0) haml (4.0.6) tilt haml-rails (0.5.3) @@ -127,6 +136,8 @@ GEM haml launchy (2.4.3) addressable (~> 2.3) + loofah (2.0.1) + nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) mechanize (2.7.3) @@ -143,13 +154,13 @@ GEM mini_portile (0.6.2) minitest (5.5.1) msgpack (0.5.11) - multi_json (1.10.1) + multi_json (1.11.0) net-http-digest_auth (1.4) net-http-persistent (2.9.4) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) ntlm-http (0.1.1) - poltergeist (1.5.1) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -158,26 +169,35 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-rails (0.3.2) + pry-rails (0.3.4) pry (>= 0.9.10) puma (2.11.1) rack (>= 1.1, < 2.0) - rack (1.5.2) + rack (1.6.0) rack-test (0.6.3) rack (>= 1.0) - rails (4.1.9) - actionmailer (= 4.1.9) - actionpack (= 4.1.9) - actionview (= 4.1.9) - activemodel (= 4.1.9) - activerecord (= 4.1.9) - activesupport (= 4.1.9) + rails (4.2.1) + actionmailer (= 4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) + activemodel (= 4.2.1) + activerecord (= 4.2.1) + activesupport (= 4.2.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.9) - sprockets-rails (~> 2.0) - railties (4.1.9) - actionpack (= 4.1.9) - activesupport (= 4.1.9) + railties (= 4.2.1) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.6) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.2) + loofah (~> 2.0) + railties (4.2.1) + actionpack (= 4.2.1) + activesupport (= 4.2.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -232,7 +252,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timecop (0.7.1) + timecop (0.7.3) timers (1.1.0) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -245,9 +265,9 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) webrobots (0.1.1) - websocket-driver (0.5.1) + websocket-driver (0.5.4) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.1) + websocket-extensions (0.1.2) xpath (2.0.0) nokogiri (~> 1.3) yajl-ruby (1.2.1) diff --git a/fluentd-ui.gemspec b/fluentd-ui.gemspec index 2d225b7..f3bc22c 100644 --- a/fluentd-ui.gemspec +++ b/fluentd-ui.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "fluentd", [">= 0.10.56", "< 2"] - spec.add_dependency 'rails', '~> 4.1.7' + spec.add_dependency 'rails', '~> 4.2.0' spec.add_dependency 'sucker_punch', "~> 1.0.5" spec.add_dependency 'addressable' spec.add_dependency "font-awesome-rails"