From 7c27d6f3ddcfc322a8dd784fa311598e3c72e709 Mon Sep 17 00:00:00 2001 From: yuichiro Date: Thu, 9 Aug 2012 23:05:55 +0900 Subject: [PATCH] rails update to 3.2.7 --- Gemfile | 2 +- Gemfile.lock | 194 ++++++++++++++++++++++++++++------------------------------- 2 files changed, 93 insertions(+), 103 deletions(-) diff --git a/Gemfile b/Gemfile index 664a2a0..5f28631 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '= 3.2.3' +gem 'rails', '= 3.2.7' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 00d282e..e7fac58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,34 +1,34 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) + actionmailer (3.2.7) + actionpack (= 3.2.7) mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + actionpack (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.3) - activesupport (= 3.2.3) + sprockets (~> 2.1.3) + activemodel (3.2.7) + activesupport (= 3.2.7) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) + activeresource (3.2.7) + activemodel (= 3.2.7) + activesupport (= 3.2.7) + activesupport (3.2.7) i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.2.7) + addressable (2.3.2) arel (3.0.2) builder (3.0.0) capybara (1.1.2) @@ -38,22 +38,21 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.1) - ffi (~> 1.0.6) - coderay (1.0.6) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) + coderay (1.0.7) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.2.0) - cucumber (1.1.9) + coffee-script-source (1.3.3) + cucumber (1.2.1) builder (>= 2.1.2) - diff-lcs (>= 1.1.2) - gherkin (~> 2.9.0) + diff-lcs (>= 1.1.3) + gherkin (~> 2.11.0) json (>= 1.4.6) - term-ansicolor (>= 1.0.6) cucumber-rails (1.3.0) capybara (>= 1.1.2) cucumber (>= 1.1.8) @@ -62,22 +61,22 @@ GEM capybara (>= 1.1.2) cucumber (>= 1.1.1) launchy - database_cleaner (0.7.2) + database_cleaner (0.8.0) diff-lcs (1.1.3) domain_name (0.5.3) unf (~> 0.0.3) erubis (2.7.0) - execjs (1.3.0) + execjs (1.4.0) multi_json (~> 1.0) - fabrication (1.3.2) + fabrication (2.2.2) faker (1.0.1) i18n (~> 0.4) - ffi (1.0.11) - gherkin (2.9.3) + ffi (1.1.5) + gherkin (2.11.1) json (>= 1.4.6) - gherkin (2.9.3-x86-mingw32) + gherkin (2.11.1-x86-mingw32) json (>= 1.4.6) - haml (3.1.4) + haml (3.1.6) haml-rails (0.3.4) actionpack (~> 3.0) activesupport (~> 3.0) @@ -85,26 +84,28 @@ GEM railties (~> 3.0) hike (1.2.1) i18n (0.6.0) - i18n_generators (1.2.0) + i18n_generators (1.2.1) mechanize rails (>= 3.0.0) - journey (1.0.3) + journey (1.0.4) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.6.6) + json (1.7.4) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) railties (>= 3.0.0) - launchy (2.1.0) - addressable (~> 2.2.6) + launchy (2.1.2) + addressable (~> 2.3) libv8 (3.3.10.4) + libwebsocket (0.1.5) + addressable mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mechanize (2.3) + mechanize (2.5.1) domain_name (~> 0.5, >= 0.5.1) mime-types (~> 1.17, >= 1.17.2) net-http-digest_auth (~> 1.1, >= 1.1.1) @@ -117,26 +118,26 @@ GEM activerecord (~> 3.1) activesupport (~> 3.1) polyamorous (~> 0.5.0) - method_source (0.7.1) - mime-types (1.18) + method_source (0.8) + mime-types (1.19) moro-miso (0.0.6) - multi_json (1.2.0) - net-http-digest_auth (1.2) - net-http-persistent (2.6) - nokogiri (1.5.2) - nokogiri (1.5.2-x86-mingw32) + multi_json (1.3.6) + net-http-digest_auth (1.2.1) + net-http-persistent (2.7) + nokogiri (1.5.5) + nokogiri (1.5.5-x86-mingw32) ntlm-http (0.1.1) polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) - pry (0.9.8.4) + pry (0.9.10) coderay (~> 1.0.5) - method_source (~> 0.7.1) - slop (>= 2.4.4, < 3) - pry (0.9.8.4-x86-mingw32) + method_source (~> 0.8) + slop (~> 3.3.1) + pry (0.9.10-x86-mingw32) coderay (~> 1.0.5) - method_source (~> 0.7.1) - slop (>= 2.4.4, < 3) + method_source (~> 0.8) + slop (~> 3.3.1) win32console (~> 1.3) rack (1.4.1) rack-cache (1.2) @@ -145,91 +146,80 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + rails (3.2.7) + actionmailer (= 3.2.7) + actionpack (= 3.2.7) + activerecord (= 3.2.7) + activeresource (= 3.2.7) + activesupport (= 3.2.7) bundler (~> 1.0) - railties (= 3.2.3) - rails-i18n (0.6.2) + railties (= 3.2.7) + rails-i18n (0.6.5) i18n (~> 0.5) rails3-generators (0.17.4) railties (>= 3.0.0) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + railties (3.2.7) + actionpack (= 3.2.7) + activesupport (= 3.2.7) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) + thor (>= 0.14.6, < 2.0) rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - rspec (2.9.0) - rspec-core (~> 2.9.0) - rspec-expectations (~> 2.9.0) - rspec-mocks (~> 2.9.0) - rspec-core (2.9.0) - rspec-expectations (2.9.1) + rspec (2.11.0) + rspec-core (~> 2.11.0) + rspec-expectations (~> 2.11.0) + rspec-mocks (~> 2.11.0) + rspec-core (2.11.1) + rspec-expectations (2.11.2) diff-lcs (~> 1.1.3) - rspec-mocks (2.9.0) - rspec-rails (2.9.0) + rspec-mocks (2.11.1) + rspec-rails (2.11.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.9.0) - rubyzip (0.9.6.1) - sass (3.1.15) + rspec (~> 2.11.0) + rubyzip (0.9.9) + sass (3.1.20) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.20.0) + selenium-webdriver (2.25.0) childprocess (>= 0.2.5) - ffi (~> 1.0) + libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip - simple_form (2.0.1) + simple_form (2.0.2) actionpack (~> 3.0) activemodel (~> 3.0) - slop (2.4.4) - spork (0.9.0) - spork (0.9.0-x86-mingw32) - win32-process - sprockets (2.1.2) + slop (3.3.2) + spork (0.9.2) + sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) - sqlite3 (1.3.5-x86-mingw32) - term-ansicolor (1.0.7) - therubyracer (0.10.1) + sqlite3 (1.3.6) + sqlite3 (1.3.6-x86-mingw32) + therubyracer (0.10.2) libv8 (~> 3.3.10) - thor (0.14.6) + thor (0.15.4) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) - uglifier (1.2.4) + tzinfo (0.3.33) + uglifier (1.2.7) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + multi_json (~> 1.3) unf (0.0.5) unf_ext - unf_ext (0.0.4) - unf_ext (0.0.4-x86-mingw32) + unf_ext (0.0.5) + unf_ext (0.0.5-x86-mingw32) webrobots (0.0.13) - win32-api (1.4.8-x86-mingw32) - win32-process (0.6.5) - windows-pr (>= 1.1.2) - win32console (1.3.0-x86-mingw32) - windows-api (0.4.1) - win32-api (>= 1.4.5) - windows-pr (1.2.1) - win32-api (>= 1.4.5) - windows-api (>= 0.3.0) + win32console (1.3.2-x86-mingw32) xpath (0.1.4) nokogiri (~> 1.3) @@ -255,7 +245,7 @@ DEPENDENCIES meta_search moro-miso pry - rails (= 3.2.3) + rails (= 3.2.7) rails-i18n rails3-generators rspec-rails -- 2.11.4.GIT