diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-11-17 18:05:31 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-11-17 18:05:31 +0000 |
| commit | ab76e4a18904af104ab532cc273ba15d9bef6f75 (patch) | |
| tree | f06e7705867e9b6a8f5489f5eaeeee272fe156ce | |
| parent | e09f967869bc53751a98bfe2cd88d81feca1423f (diff) | |
| parent | 210881d90c213229be18869e290e0550a7a310ff (diff) | |
Merge branch 'hotfix/0.19.0.10' into rails-3-develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 50 |
2 files changed, 26 insertions, 26 deletions
@@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.20' +gem 'rails', '3.2.21' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 51f736b50..3b2138be5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,12 +26,12 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.20) - actionpack (= 3.2.20) + actionmailer (3.2.21) + actionpack (= 3.2.21) mail (~> 2.5.4) - actionpack (3.2.20) - activemodel (= 3.2.20) - activesupport (= 3.2.20) + actionpack (3.2.21) + activemodel (= 3.2.21) + activesupport (= 3.2.21) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -39,18 +39,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.20) - activesupport (= 3.2.20) + activemodel (3.2.21) + activesupport (= 3.2.21) builder (~> 3.0.0) - activerecord (3.2.20) - activemodel (= 3.2.20) - activesupport (= 3.2.20) + activerecord (3.2.21) + activemodel (= 3.2.21) + activesupport (= 3.2.21) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.20) - activemodel (= 3.2.20) - activesupport (= 3.2.20) - activesupport (3.2.20) + activeresource (3.2.21) + activemodel (= 3.2.21) + activesupport (= 3.2.21) + activesupport (3.2.21) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) annotate (2.5.0) @@ -180,19 +180,19 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.20) - actionmailer (= 3.2.20) - actionpack (= 3.2.20) - activerecord (= 3.2.20) - activeresource (= 3.2.20) - activesupport (= 3.2.20) + rails (3.2.21) + actionmailer (= 3.2.21) + actionpack (= 3.2.21) + activerecord (= 3.2.21) + activeresource (= 3.2.21) + activesupport (= 3.2.21) bundler (~> 1.0) - railties (= 3.2.20) + railties (= 3.2.21) rails-i18n (0.7.3) i18n (~> 0.5) - railties (3.2.20) - actionpack (= 3.2.20) - activesupport (= 3.2.20) + railties (3.2.21) + actionpack (= 3.2.21) + activesupport (= 3.2.21) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -319,7 +319,7 @@ DEPENDENCIES pg quiet_assets rack - rails (= 3.2.20) + rails (= 3.2.21) rails-i18n rake (= 0.9.2.2) rdoc |