diff --git a/Gemfile b/Gemfile index 263215e..a7e2769 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.11' +gem 'rails', '3.2.12' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 590cffc..72ae3f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,38 @@ GEM remote: https://rubygems.org/ 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) arel (3.0.2) bcrypt-ruby (3.0.1) - bson (1.8.1) - bson_ext (1.8.1) - bson (~> 1.8.1) + bson (1.8.2) + bson_ext (1.8.2) + bson (~> 1.8.2) builder (3.0.4) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -45,7 +45,7 @@ GEM erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - faraday (0.8.4) + faraday (0.8.5) multipart-post (~> 1.1) feedzirra (0.0.31) activesupport (>= 3.0.8) @@ -57,21 +57,22 @@ GEM rake (>= 0.9.2) rdoc (~> 3.8) sax-machine (~> 0.0.20) - haml (3.1.7) - haml-rails (0.3.5) + haml (4.0.0) + tilt + haml-rails (0.4) actionpack (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) - haml (~> 3.1) + haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) hike (1.2.1) htmlentities (4.3.1) httpauth (0.2.0) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.6) + json (1.7.7) jwt (0.1.5) multi_json (>= 1.0) loofah (1.0.0) @@ -80,21 +81,21 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) + mime-types (1.21) mm-multi-parameter-attributes (0.2.2) mongo_mapper (>= 0.9.0) tzinfo - mongo (1.8.1) - bson (~> 1.8.1) + mongo (1.8.2) + bson (~> 1.8.2) mongo_mapper (0.12.0) activemodel (~> 3.0) activesupport (~> 3.0) plucky (~> 0.5.2) - multi_json (1.5.0) + multi_json (1.6.1) multipart-post (1.1.5) nokogiri (1.4.7) oauth (0.4.7) - oauth2 (0.8.0) + oauth2 (0.8.1) faraday (~> 0.8) httpauth (~> 0.1) jwt (~> 0.1.4) @@ -103,39 +104,39 @@ GEM plucky (0.5.2) mongo (~> 1.5) polyglot (0.3.3) - rack (1.4.4) + 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) sass (3.2.5) - sass-rails (3.2.5) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) sax-machine (0.0.20) nokogiri (> 0.0.0) - sorcery (0.8.0) + sorcery (0.8.1) bcrypt-ruby (~> 3.0.0) oauth (~> 0.4.4) oauth2 (~> 0.8.0) @@ -144,7 +145,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thor (0.16.0) + thor (0.17.0) tilt (1.3.3) treetop (1.4.12) polyglot @@ -167,7 +168,7 @@ DEPENDENCIES jquery-rails mm-multi-parameter-attributes mongo_mapper - rails (= 3.2.11) + rails (= 3.2.12) sass-rails (~> 3.2.3) sorcery uglifier (>= 1.0.3)