diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-09 17:45:50 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-09 17:45:50 +0300 |
commit | e754e9d140ceef2882184679b72735b1e31be56a (patch) | |
tree | 8088ed2e6a63b5d0404eb206a9f3f4982e1d073b /Gemfile.lock | |
parent | 35ab3d8bdc7c25654e0ffaabc1f3cf42bac730f4 (diff) | |
download | gitlab-ci-e754e9d140ceef2882184679b72735b1e31be56a.tar.gz |
Update rails to 4.0.10
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 966369d..7192139 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.5) - actionpack (= 4.0.5) - mail (~> 2.5.4) - actionpack (4.0.5) - activesupport (= 4.0.5) + actionmailer (4.0.10) + actionpack (= 4.0.10) + mail (~> 2.5, >= 2.5.4) + actionpack (4.0.10) + activesupport (= 4.0.10) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) @@ -14,20 +14,20 @@ GEM actionpack (>= 4.0.0, < 5.0) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - activemodel (4.0.5) - activesupport (= 4.0.5) + activemodel (4.0.10) + activesupport (= 4.0.10) builder (~> 3.1.0) - activerecord (4.0.5) - activemodel (= 4.0.5) + activerecord (4.0.10) + activemodel (= 4.0.10) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.5) + activesupport (= 4.0.10) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) activerecord-session_store (0.1.0) actionpack (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) railties (>= 4.0.0, < 5) - activesupport (4.0.5) + activesupport (4.0.10) i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) @@ -130,7 +130,7 @@ GEM httparty (0.11.0) multi_json (~> 1.0) multi_xml (>= 0.5.2) - i18n (0.6.9) + i18n (0.6.11) ice_nine (0.11.0) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) @@ -153,14 +153,13 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) lumberjack (1.0.4) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + mail (2.6.1) + mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (1.25.1) + mime-types (2.4.1) mini_portile (0.5.2) minitest (4.3.2) - multi_json (1.10.0) + multi_json (1.10.1) multi_xml (0.5.5) mysql2 (0.3.14) nokogiri (1.6.0) @@ -172,7 +171,6 @@ GEM cliver (~> 0.2.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.4) protected_attributes (1.0.5) activemodel (>= 4.0.1, < 5.0) pry (0.9.12.4) @@ -190,21 +188,21 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (4.0.5) - actionmailer (= 4.0.5) - actionpack (= 4.0.5) - activerecord (= 4.0.5) - activesupport (= 4.0.5) + rails (4.0.10) + actionmailer (= 4.0.10) + actionpack (= 4.0.10) + activerecord (= 4.0.10) + activesupport (= 4.0.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.5) - sprockets-rails (~> 2.0.0) - railties (4.0.5) - actionpack (= 4.0.5) - activesupport (= 4.0.5) + railties (= 4.0.10) + sprockets-rails (~> 2.0) + railties (4.0.10) + actionpack (= 4.0.10) + activesupport (= 4.0.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.12.0) - rake (10.3.1) + rake (10.3.2) rb-fsevent (0.9.3) rb-inotify (0.9.2) ffi (>= 0.5.0) @@ -263,7 +261,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.1.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -280,12 +278,9 @@ GEM tilt (1.4.1) timers (1.1.0) tins (0.13.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) turbolinks (2.0.0) coffee-rails - tzinfo (0.3.39) + tzinfo (0.3.41) uglifier (2.3.2) execjs (>= 0.3.0) json (>= 1.8.0) @@ -344,7 +339,7 @@ DEPENDENCIES protected_attributes pry quiet_assets - rails (= 4.0.5) + rails (= 4.0.10) rake rb-fsevent rb-inotify |