diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-16 10:59:51 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-16 10:59:51 +0100 |
| commit | 22379d3a788c4d00cd12b738f01e5ca642b89ea4 (patch) | |
| tree | 22819a2b77f97e116bec33f666d92eca6751edeb | |
| parent | 8e16b8a24341fd579d97ce47512951a3d14250c1 (diff) | |
| parent | 1cf48357d936056e383a52a3410f87b89e1a9829 (diff) | |
Merge branch 'rails_upgrade' into develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 50 |
2 files changed, 26 insertions, 26 deletions
@@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.9' +gem 'rails', '3.2.11' gem 'bcrypt-ruby' gem 'sqlite3' gem 'mysql2' diff --git a/Gemfile.lock b/Gemfile.lock index dd98f2d..d82d82f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.9) - actionpack (= 3.2.9) + actionmailer (3.2.11) + actionpack (= 3.2.11) mail (~> 2.4.4) - actionpack (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + actionpack (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,18 +14,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.9) - activesupport (= 3.2.9) + activemodel (3.2.11) + activesupport (= 3.2.11) builder (~> 3.0.0) - activerecord (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + activerecord (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) - activesupport (3.2.9) + activeresource (3.2.11) + activemodel (= 3.2.11) + activesupport (= 3.2.11) + activesupport (3.2.11) i18n (~> 0.6) multi_json (~> 1.0) acts_as_list (0.1.9) @@ -122,17 +122,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.9) - actionmailer (= 3.2.9) - actionpack (= 3.2.9) - activerecord (= 3.2.9) - activeresource (= 3.2.9) - activesupport (= 3.2.9) + rails (3.2.11) + actionmailer (= 3.2.11) + actionpack (= 3.2.11) + activerecord (= 3.2.11) + activeresource (= 3.2.11) + activesupport (= 3.2.11) bundler (~> 1.0) - railties (= 3.2.9) - railties (3.2.9) - actionpack (= 3.2.9) - activesupport (= 3.2.9) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -202,7 +202,7 @@ DEPENDENCIES mysql2 nokogiri private_pub - rails (= 3.2.9) + rails (= 3.2.11) sass-rails simple_form (= 2.0.1) sqlite3 |