diff --git a/Gemfile.lock b/Gemfile.lock index cb7070fc216..670fe941dec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,12 +73,12 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.12) + actionpack (= 3.2.12) + mail (~> 2.4.4) + actionpack (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -89,22 +89,22 @@ GEM active_attr (0.7.0) activemodel (>= 3.0.2, < 4.1) activesupport (>= 3.0.2, < 4.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.12) + activesupport (= 3.2.12) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-postgres-hstore (0.7.1) rails rake - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.12) + activemodel (= 3.2.12) + activesupport (= 3.2.12) + activesupport (3.2.12) + i18n (~> 0.6) multi_json (~> 1.0) acts_as_paranoid (0.4.1) activerecord (~> 3.2) @@ -120,8 +120,8 @@ GEM erubis (>= 2.6.6) binding_of_caller (0.7.1) debug_inspector (>= 0.0.1) - bourne (1.4.0) - mocha (~> 0.13.2) + bourne (1.1.2) + mocha (= 0.10.5) builder (3.0.4) celluloid (0.12.4) facter (>= 1.6.12) @@ -244,7 +244,7 @@ GEM libv8 (3.11.8.13) listen (0.7.2) lumberjack (1.0.2) - mail (2.5.3) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -258,9 +258,9 @@ GEM mixlib-config (1.1.2) mixlib-log (1.4.1) mixlib-shellout (1.1.0) - mocha (0.13.3) + mocha (0.10.5) metaclass (~> 0.0.1) - multi_json (1.7.1) + multi_json (1.6.1) multipart-post (1.1.5) mustache (0.99.4) net-scp (1.0.4) @@ -332,17 +332,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + 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.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + 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) @@ -353,7 +353,7 @@ GEM rb-fsevent (0.9.3) rb-inotify (0.8.8) ffi (>= 0.5.0) - rdoc (3.12.2) + rdoc (3.12.1) json (~> 1.4) redcarpet (2.2.2) redis (3.0.2) @@ -406,13 +406,13 @@ GEM seed-fu (2.2.0) activerecord (~> 3.1) activesupport (~> 3.1) - shoulda (3.4.0) - shoulda-context (~> 1.0, >= 1.0.1) - shoulda-matchers (~> 1.0, >= 1.4.1) + shoulda (3.3.2) + shoulda-context (~> 1.0.1) + shoulda-matchers (~> 1.4.1) shoulda-context (1.0.2) - shoulda-matchers (1.5.1) + shoulda-matchers (1.4.2) activesupport (>= 3.0.0) - bourne (~> 1.3) + bourne (~> 1.1.2) sidekiq (2.7.0) celluloid (~> 0.12.0) connection_pool (~> 1.0) @@ -449,7 +449,7 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.17.0) - tilt (1.3.6) + tilt (1.3.3) timers (1.1.0) treetop (1.4.12) polyglot