SUZUKI Miho
null+****@clear*****
Thu Jan 17 10:10:54 JST 2013
SUZUKI Miho 2013-01-17 10:10:54 +0900 (Thu, 17 Jan 2013) New Revision: 62519d24e67acf59e6c9d42887168831eba51887 https://github.com/logaling/logaling-server/commit/62519d24e67acf59e6c9d42887168831eba51887 Merged 27e9835: Merge pull request #47 from logaling/bump_rails_version Log: Bump rails version 3.2.9 to 3.2.11 Modified files: Gemfile Gemfile.lock Modified: Gemfile (+1 -1) =================================================================== --- Gemfile 2012-12-25 11:07:12 +0900 (99b86a2) +++ Gemfile 2013-01-17 10:10:54 +0900 (41a7508) @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.9' +gem 'rails', '3.2.11' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' Modified: Gemfile.lock (+29 -29) =================================================================== --- Gemfile.lock 2012-12-25 11:07:12 +0900 (9834a11) +++ Gemfile.lock 2013-01-17 10:10:54 +0900 (b5768df) @@ -13,12 +13,12 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.9) - actionpack (= 3.2.9) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -30,18 +30,18 @@ GEM activemodel (>= 3.0.2, < 4.1) activesupport (>= 3.0.2, < 4.1) active_decorator (0.3.3) - activemodel (3.2.9) - activesupport (= 3.2.9) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) - activesupport (3.2.9) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.3.2) @@ -121,7 +121,7 @@ GEM railties (>= 3.2.0, < 5.0) thor (~> 0.14) jruby-pageant (1.1.1) - json (1.7.5) + json (1.7.6) jwt (0.1.5) multi_json (>= 1.0) kaminari (0.13.0) @@ -186,32 +186,32 @@ GEM pg (0.14.1) pkg-config (1.1.4) polyglot (0.3.3) - rack (1.4.1) + rack (1.4.4) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.9) - actionmailer (= 3.2.9) - actionpack (= 3.2.9) - activerecord (= 3.2.9) - activeresource (= 3.2.9) - activesupport (= 3.2.9) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.9) + railties (= 3.2.11) rails-footnotes (3.7.8) rails (>= 3.0.0) - railties (3.2.9) - actionpack (= 3.2.9) - activesupport (= 3.2.9) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rainbow (1.1.4) - rake (10.0.2) + rake (10.0.3) rdoc (3.12) json (~> 1.4) rroonga (2.0.8) @@ -244,7 +244,7 @@ GEM libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip - sprockets (2.2.1) + sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -298,7 +298,7 @@ DEPENDENCIES omniauth-github omniauth-twitter pg - rails (= 3.2.9) + rails (= 3.2.11) rails-footnotes rspec-rails rvm-capistrano -------------- next part -------------- An HTML attachment was scrubbed...Download