diff --git a/Gemfile b/Gemfile index 10acf773..195dee2b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Core gems -gem 'rails', '3.2.11' +gem 'rails', '3.2.12' # Database adapters gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 14c36840..9c574b3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,31 +10,31 @@ GEM yajl-ruby (>= 1.0.0) _bushido-faye-websocket (0.4.4) eventmachine (>= 0.12.0) - 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) @@ -134,7 +134,7 @@ GEM highline (1.6.15) hike (1.2.1) http_parser.rb (0.5.3) - i18n (0.6.1) + i18n (0.6.2) jasmine (1.3.1) jasmine-core (~> 1.3.1) rack (~> 1.0) @@ -160,7 +160,7 @@ GEM mime-types (1.21) mocha (0.10.5) metaclass (~> 0.0.1) - multi_json (1.5.1) + multi_json (1.6.1) nokogiri (1.5.6) orm_adapter (0.0.7) paperclip (3.4.0) @@ -186,23 +186,23 @@ GEM 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.1) + rdoc (3.12.2) json (~> 1.4) remotipart (1.0.5) rest-client (1.6.7) @@ -301,7 +301,7 @@ DEPENDENCIES pg pry-rails quiet_assets - rails (= 3.2.11) + rails (= 3.2.12) remotipart rspec-rails sass-rails