diff --git a/Gemfile b/Gemfile index c9eab07..ab32ea0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '3.2.12' gem 'mongoid', '~> 2.4.10' gem 'mongoid_rails_migrations' gem 'devise', '~> 1.5.4' diff --git a/Gemfile.lock b/Gemfile.lock index aad5c7d..c694ba1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,35 +9,35 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.11) - actionpack (= 3.2.11) + actionmailer (3.2.12) + actionpack (= 3.2.12) mail (~> 2.4.4) actionmailer_inline_css (1.3.1) actionmailer (>= 3.0.0) nokogiri (>= 1.4.4) premailer (>= 1.7.1) - 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) @@ -131,7 +131,7 @@ GEM has_scope (~> 0.5.0) responders (~> 0.6) journey (1.0.4) - json (1.7.6) + json (1.7.7) jwt (0.1.5) multi_json (>= 1.0) kaminari (0.14.1) @@ -154,7 +154,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.7.1) - mime-types (1.19) + mime-types (1.21) mongo (1.6.2) bson (~> 1.6.2) mongoid (2.4.10) @@ -166,7 +166,7 @@ GEM bundler (>= 1.0.0) rails (>= 3.0.0) railties (>= 3.0.0) - multi_json (1.5.0) + multi_json (1.5.1) multi_xml (0.5.2) multipart-post (1.1.5) net-scp (1.0.4) @@ -223,24 +223,24 @@ GEM rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-ssl-enforcer (0.2.4) 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.12) rails_autolink (1.0.9) rails (~> 3.1) - railties (3.2.11) - actionpack (= 3.2.11) - activesupport (= 3.2.11) + railties (3.2.12) + actionpack (= 3.2.12) + activesupport (= 3.2.12) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -248,7 +248,7 @@ GEM raindrops (0.10.0) rake (10.0.3) rbx-require-relative (0.0.9) - rdoc (3.12) + rdoc (3.12.1) json (~> 1.4) responders (0.9.2) railties (~> 3.1) @@ -297,7 +297,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.16.0) + thor (0.17.0) tilt (1.3.3) timecop (0.3.5) treetop (1.4.12) @@ -366,7 +366,7 @@ DEPENDENCIES pry-rails rack-ssl rack-ssl-enforcer - rails (= 3.2.11) + rails (= 3.2.12) rails_autolink (~> 1.0.9) ri_cal rspec-rails (~> 2.6) -- libgit2 0.21.2