diff options
author | rhenium <rhenium@rhe.jp> | 2014-07-14 04:21:28 +0900 |
---|---|---|
committer | rhenium <rhenium@rhe.jp> | 2014-07-14 05:15:08 +0900 |
commit | 32bc75846278a5caceb00f3d12b53a1a442a7cf2 (patch) | |
tree | 2578e1185996dee8a7e62b2c6158126a633016eb /Gemfile.lock | |
parent | ea9eb5d5c273208f4c954c5a2cfed0334eab9989 (diff) | |
download | aclog-32bc75846278a5caceb00f3d12b53a1a442a7cf2.tar.gz |
upgrade Rails to 4.1.4
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index db56866..a6fe3eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,29 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.2) - actionpack (= 4.1.2) - actionview (= 4.1.2) + actionmailer (4.1.4) + actionpack (= 4.1.4) + actionview (= 4.1.4) mail (~> 2.5.4) - actionpack (4.1.2) - actionview (= 4.1.2) - activesupport (= 4.1.2) + actionpack (4.1.4) + actionview (= 4.1.4) + activesupport (= 4.1.4) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.2) - activesupport (= 4.1.2) + actionview (4.1.4) + activesupport (= 4.1.4) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.2) - activesupport (= 4.1.2) + activemodel (4.1.4) + activesupport (= 4.1.4) builder (~> 3.1) - activerecord (4.1.2) - activemodel (= 4.1.2) - activesupport (= 4.1.2) + activerecord (4.1.4) + activemodel (= 4.1.4) + activesupport (= 4.1.4) arel (~> 5.0.0) activerecord-import (0.5.0) activerecord (>= 3.0) - activesupport (4.1.2) + activesupport (4.1.4) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -47,10 +47,10 @@ GEM coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.7.1) connection_pool (2.0.0) cool.io (1.1.1) iobuffer (>= 1.0.0) @@ -82,10 +82,10 @@ GEM multipart-post (>= 1.2, < 3) ffi (1.9.3) formatador (0.2.5) - grape (0.7.0) + grape (0.8.0) activesupport builder - hashie (>= 1.2.0) + hashie (>= 2.1.0) multi_json (>= 1.3.2) multi_xml (>= 0.5.2) rack (>= 1.3.0) @@ -113,12 +113,12 @@ GEM activesupport (>= 4.0.1) haml (>= 3.1, < 5.0) railties (>= 4.0.1) - hashie (2.1.2) + hashie (3.2.0) hike (1.2.3) http (0.6.1) http_parser.rb (~> 0.6.0) http_parser.rb (0.6.0) - i18n (0.6.9) + i18n (0.6.11) ice_nine (0.11.0) iobuffer (1.1.2) jquery-rails (3.1.1) @@ -138,7 +138,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) mime-types (1.25.1) - minitest (5.3.5) + minitest (5.4.0) msgpack (0.5.8) msgpack-rpc (0.5.2) cool.io (~> 1.1.1) @@ -148,9 +148,10 @@ GEM multipart-post (2.0.0) mysql2 (0.3.16) naught (1.0.0) + netrc (0.7.7) oauth (0.4.7) - omniauth (1.2.1) - hashie (>= 1.2, < 3) + omniauth (1.2.2) + hashie (>= 1.2, < 4) rack (~> 1.0) omniauth-oauth (1.0.1) oauth @@ -176,19 +177,19 @@ GEM rack (>= 1.0.0) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.2) - actionmailer (= 4.1.2) - actionpack (= 4.1.2) - actionview (= 4.1.2) - activemodel (= 4.1.2) - activerecord (= 4.1.2) - activesupport (= 4.1.2) + 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) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.2) + railties (= 4.1.4) sprockets-rails (~> 2.0) - railties (4.1.2) - actionpack (= 4.1.2) - activesupport (= 4.1.2) + railties (4.1.4) + actionpack (= 4.1.4) + activesupport (= 4.1.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -196,8 +197,9 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - rest-client (1.6.7) - mime-types (>= 1.16) + rest-client (1.7.1) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) rspec (3.0.0) rspec-core (~> 3.0.0) rspec-expectations (~> 3.0.0) @@ -318,7 +320,7 @@ DEPENDENCIES omniauth-twitter pry-rails quiet_assets - rails (~> 4.1.2) + rails (~> 4.1.4) rspec (~> 3.0.0) rspec-rails (~> 3.0.0) sass-rails (~> 4.0.3) |