# HG changeset patch # User edogawaconan # Date 1409911395 -32400 # Node ID aad3b253ffd583a6bb5ee472efda9ca1d602dfad # Parent bf9dbbec8c1ef73112000931b225db7fde388008 Update gems. diff -r bf9dbbec8c1e -r aad3b253ffd5 Gemfile --- a/Gemfile Fri Sep 05 18:52:03 2014 +0900 +++ b/Gemfile Fri Sep 05 19:03:15 2014 +0900 @@ -2,7 +2,7 @@ # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.1.4' +gem 'rails', '~> 4.1.4' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. diff -r bf9dbbec8c1e -r aad3b253ffd5 Gemfile.lock --- a/Gemfile.lock Fri Sep 05 18:52:03 2014 +0900 +++ b/Gemfile.lock Fri Sep 05 19:03:15 2014 +0900 @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.4) - actionpack (= 4.1.4) - actionview (= 4.1.4) + actionmailer (4.1.5) + actionpack (= 4.1.5) + actionview (= 4.1.5) mail (~> 2.5.4) - actionpack (4.1.4) - actionview (= 4.1.4) - activesupport (= 4.1.4) + actionpack (4.1.5) + actionview (= 4.1.5) + activesupport (= 4.1.5) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.4) - activesupport (= 4.1.4) + actionview (4.1.5) + activesupport (= 4.1.5) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.4) - activesupport (= 4.1.4) + activemodel (4.1.5) + activesupport (= 4.1.5) builder (~> 3.1) - activerecord (4.1.4) - activemodel (= 4.1.4) - activesupport (= 4.1.4) + activerecord (4.1.5) + activemodel (= 4.1.5) + activesupport (= 4.1.5) arel (~> 5.0.0) - activesupport (4.1.4) + activesupport (4.1.5) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -36,7 +36,7 @@ faraday (0.9.0) multipart-post (>= 1.2, < 3) hike (1.2.3) - http (0.6.1) + http (0.6.2) http_parser.rb (~> 0.6.0) http_parser.rb (0.6.0) i18n (0.6.11) @@ -55,19 +55,19 @@ rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.4) - actionmailer (= 4.1.4) - actionpack (= 4.1.4) - actionview (= 4.1.4) - activemodel (= 4.1.4) - activerecord (= 4.1.4) - activesupport (= 4.1.4) + rails (4.1.5) + actionmailer (= 4.1.5) + actionpack (= 4.1.5) + actionview (= 4.1.5) + activemodel (= 4.1.5) + activerecord (= 4.1.5) + activesupport (= 4.1.5) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.4) + railties (= 4.1.5) sprockets-rails (~> 2.0) - railties (4.1.4) - actionpack (= 4.1.4) - activesupport (= 4.1.4) + railties (4.1.5) + actionpack (= 4.1.5) + activesupport (= 4.1.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) @@ -116,7 +116,7 @@ ruby DEPENDENCIES - rails (= 4.1.4) + rails (~> 4.1.4) sdoc (~> 0.4.0) spring twitter