diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-20 16:57:56 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-20 16:57:56 +0200 |
| commit | 5f47719d4b041ae18c6d359e64dfacb5aee8b2a8 (patch) | |
| tree | 2355d80bb4b28d592c289bec40cb1f71fd9358b4 | |
| parent | 6c37531581503cac1e317b76ae4d271e49383786 (diff) | |
| download | gitlab-ci-5f47719d4b041ae18c6d359e64dfacb5aee8b2a8.tar.gz | |
Update rails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 50 |
3 files changed, 27 insertions, 26 deletions
@@ -1,6 +1,7 @@ v4.3.0 - Refactor build js - Redirect to build page with sha + bid if build id is not provided + - Update rails to 4.0.3 v4.2.0 - Build duration chart @@ -8,7 +8,7 @@ def linux_only(require_as) RUBY_PLATFORM.include?('linux') && require_as end -gem 'rails', '4.0.2' +gem 'rails', '4.0.3' gem 'protected_attributes' gem 'actionpack-page_caching' gem 'actionpack-action_caching' diff --git a/Gemfile.lock b/Gemfile.lock index 7bb75bb..425d5fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.2) - actionpack (= 4.0.2) + actionmailer (4.0.3) + actionpack (= 4.0.3) mail (~> 2.5.4) - actionpack (4.0.2) - activesupport (= 4.0.2) + actionpack (4.0.3) + activesupport (= 4.0.3) 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.2) - activesupport (= 4.0.2) + activemodel (4.0.3) + activesupport (= 4.0.3) builder (~> 3.1.0) - activerecord (4.0.2) - activemodel (= 4.0.2) + activerecord (4.0.3) + activemodel (= 4.0.3) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.2) + activesupport (= 4.0.3) 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.2) + activesupport (4.0.3) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) @@ -37,7 +37,7 @@ GEM annotate (2.6.0) activerecord (>= 2.3.0) rake (>= 0.8.7) - arel (4.0.1) + arel (4.0.2) atomic (1.1.14) axiom-types (0.0.5) descendants_tracker (~> 0.0.1) @@ -161,7 +161,7 @@ GEM mime-types (1.25.1) mini_portile (0.5.2) minitest (4.3.2) - multi_json (1.8.2) + multi_json (1.8.4) multi_xml (0.5.5) mysql2 (0.3.14) nokogiri (1.6.0) @@ -172,7 +172,7 @@ GEM cliver (~> 0.2.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.3) + polyglot (0.3.4) protected_attributes (1.0.5) activemodel (>= 4.0.1, < 5.0) pry (0.9.12.4) @@ -192,20 +192,20 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (4.0.2) - actionmailer (= 4.0.2) - actionpack (= 4.0.2) - activerecord (= 4.0.2) - activesupport (= 4.0.2) + rails (4.0.3) + actionmailer (= 4.0.3) + actionpack (= 4.0.3) + activerecord (= 4.0.3) + activesupport (= 4.0.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.2) + railties (= 4.0.3) sprockets-rails (~> 2.0.0) - railties (4.0.2) - actionpack (= 4.0.2) - activesupport (= 4.0.2) + railties (4.0.3) + actionpack (= 4.0.3) + activesupport (= 4.0.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) + rake (10.1.1) rb-fsevent (0.9.3) rb-inotify (0.9.2) ffi (>= 0.5.0) @@ -258,7 +258,7 @@ GEM temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) slop (3.4.7) - sprockets (2.10.1) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -341,7 +341,7 @@ DEPENDENCIES pry puma (~> 2.7.1) quiet_assets - rails (= 4.0.2) + rails (= 4.0.3) rake rb-fsevent rb-inotify |