diff --git a/Gemfile b/Gemfile index 1d25892..c25039e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://bundler-api.herokuapp.com' -gem 'rails', '3.2.11' +gem 'rails', '3.2.12' # Gems used in all environments gem 'mysql2' diff --git a/Gemfile.lock b/Gemfile.lock index 3f3215e..0be3d36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,31 +36,31 @@ GIT GEM remote: http://bundler-api.herokuapp.com/ specs: - actionmailer (3.2.11) - actionpack (= 3.2.11) + actionmailer (3.2.12) + actionpack (= 3.2.12) mail (~> 2.4.4) - actionpack (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + actionpack (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) - rack (~> 1.4.0) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.11) - activesupport (= 3.2.11) + activemodel (3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) + activerecord (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - activesupport (3.2.11) + activeresource (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) + activesupport (3.2.12) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.3.2) @@ -193,7 +193,7 @@ GEM jquery-rails (2.0.1) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - json (1.7.6) + json (1.7.7) json_builder (3.1.7) activesupport (>= 2.0.0) json @@ -235,7 +235,7 @@ GEM mime-types (1.21) mocha (0.10.5) metaclass (~> 0.0.1) - multi_json (1.5.0) + multi_json (1.6.0) multi_xml (0.5.1) multipart-post (1.1.5) mysql2 (0.3.11) @@ -276,27 +276,27 @@ GEM rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.11) - actionmailer (= 3.2.11) - actionpack (= 3.2.11) - activerecord (= 3.2.11) - activeresource (= 3.2.11) - activesupport (= 3.2.11) + rails (3.2.12) + actionmailer (= 3.2.12) + actionpack (= 3.2.12) + activerecord (= 3.2.12) + activeresource (= 3.2.12) + activesupport (= 3.2.12) bundler (~> 1.0) - railties (= 3.2.11) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (= 3.2.12) + railties (3.2.12) + actionpack (= 3.2.12) + activesupport (= 3.2.12) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) - rdoc (3.12) + rdoc (3.12.1) json (~> 1.4) redcarpet (2.2.2) redis (3.0.2) @@ -424,7 +424,7 @@ DEPENDENCIES paperclip! pg poltergeist - rails (= 3.2.11) + rails (= 3.2.12) redcarpet rest-client rqrcode-rails3