# HG changeset patch # User edogawaconan # Date 1419065854 -32400 # Node ID cbf116933259d1ee440eea209dfbb533fe855953 # Parent 9d36e15cd5eb065d47f631e4acd13233ec3fb1d6 Update to rails 4.2. diff -r 9d36e15cd5eb -r cbf116933259 Gemfile --- a/Gemfile Mon Nov 24 17:14:24 2014 +0900 +++ b/Gemfile Sat Dec 20 17:57:34 2014 +0900 @@ -1,8 +1,8 @@ source "https://rubygems.org" -gem "rails", "~> 4.1.0" +gem "rails", "~> 4.2.0" gem "jquery-rails" -gem "coffee-rails", "~> 4.0.0" # Rails 4.1 default +gem "coffee-rails", "~> 4.1.0" # Rails 4.2 default # Bundle edge Rails instead: # gem "rails", :git => "git://github.com/rails/rails.git" @@ -12,9 +12,9 @@ gem "jruby-openssl", :platforms => :jruby gem "dalli" -gem "sass-rails", "~> 4.0.3" # Rails 4.1 default +gem "sass-rails", "~> 5.0" # Rails 4.2 default -gem "uglifier", ">= 1.3.0" # Rails 4.1 default +gem "uglifier", ">= 1.3.0" # Rails 4.2 default gem "bootstrap-sass" gem "therubyrhino", :platforms => :jruby diff -r 9d36e15cd5eb -r cbf116933259 Gemfile.lock --- a/Gemfile.lock Mon Nov 24 17:14:24 2014 +0900 +++ b/Gemfile.lock Sat Dec 20 17:57:34 2014 +0900 @@ -1,42 +1,51 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) + actionmailer (4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.8) - actionview (= 4.1.8) - activesupport (= 4.1.8) - rack (~> 1.5.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.0) + actionview (= 4.2.0) + activesupport (= 4.2.0) + rack (~> 1.6.0) rack-test (~> 0.6.2) - actionview (4.1.8) - activesupport (= 4.1.8) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.8) - activesupport (= 4.1.8) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activejob (4.2.0) + activesupport (= 4.2.0) + globalid (>= 0.3.0) + activemodel (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) - activerecord (4.1.8) - activemodel (= 4.1.8) - activesupport (= 4.1.8) - arel (~> 5.0.0) + activerecord (4.2.0) + activemodel (= 4.2.0) + activesupport (= 4.2.0) + arel (~> 6.0) activerecord-jdbc-adapter (1.3.13) activerecord (>= 2.2) activerecord-jdbcpostgresql-adapter (1.3.13) activerecord-jdbc-adapter (~> 1.3.13) jdbc-postgres (>= 9.1) - activesupport (4.1.8) - i18n (~> 0.6, >= 0.6.9) + activesupport (4.2.0) + 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) - arel (5.0.1.20140414130214) + arel (6.0.0) bootstrap-sass (3.3.1.0) sass (~> 3.2) builder (3.2.2) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) coffee-script (2.3.0) @@ -46,63 +55,82 @@ dalli (2.7.2) erubis (2.7.0) execjs (2.2.2) + globalid (0.3.0) + activesupport (>= 4.1.0) hike (1.2.3) hooves (0.7) unicorn (> 0) - i18n (0.6.11) + i18n (0.7.0) jdbc-postgres (9.3.1102) - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) + jquery-rails (4.0.2) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jruby-openssl (0.9.5-java) + jruby-openssl (0.9.6-java) json (1.8.1) json (1.8.1-java) kgio (2.9.2) + loofah (2.0.1) + nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) - minitest (5.4.3) + mini_portile (0.6.1) + minitest (5.5.0) multi_json (1.10.1) - newrelic_rpm (3.9.7.266) + newrelic_rpm (3.9.8.273) + nokogiri (1.6.5) + mini_portile (~> 0.6.0) + nokogiri (1.6.5-java) pg (0.17.1) - puma (2.10.0) + puma (2.10.2) rack (>= 1.1, < 2.0) - puma (2.10.0-java) + puma (2.10.2-java) rack (>= 1.1, < 2.0) quiet_assets (1.0.3) railties (>= 3.1, < 5.0) - rack (1.5.2) + rack (1.6.0) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.8) - actionmailer (= 4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) - activemodel (= 4.1.8) - activerecord (= 4.1.8) - activesupport (= 4.1.8) + rails (4.2.0) + actionmailer (= 4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) + activemodel (= 4.2.0) + activerecord (= 4.2.0) + activesupport (= 4.2.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.8) - sprockets-rails (~> 2.0) - railties (4.1.8) - actionpack (= 4.1.8) - activesupport (= 4.1.8) + railties (= 4.2.0) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.5) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.1) + loofah (~> 2.0) + railties (4.2.0) + actionpack (= 4.2.0) + activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (10.3.2) - sass (3.2.19) - sass-rails (4.0.4) + rake (10.4.2) + sass (3.4.9) + sass-rails (5.0.0) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.2) - sprockets (~> 2.8, < 2.12) - sprockets-rails (~> 2.0) - sprockets (2.11.3) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (~> 1.1) + sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.1) + sprockets-rails (2.2.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -115,7 +143,7 @@ tilt (1.4.1) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.3) + uglifier (2.6.0) execjs (>= 0.3.0) json (>= 1.8.0) unicorn (4.8.3) @@ -130,7 +158,7 @@ DEPENDENCIES activerecord-jdbcpostgresql-adapter bootstrap-sass - coffee-rails (~> 4.0.0) + coffee-rails (~> 4.1.0) dalli hooves jquery-rails @@ -139,8 +167,8 @@ pg puma quiet_assets - rails (~> 4.1.0) - sass-rails (~> 4.0.3) + rails (~> 4.2.0) + sass-rails (~> 5.0) therubyrhino uglifier (>= 1.3.0) unicorn