diff --git a/core/Gemfile.lock b/core/Gemfile.lock index 703210b9..ad9279df 100644 --- a/core/Gemfile.lock +++ b/core/Gemfile.lock @@ -15,12 +15,12 @@ PATH GEM remote: http://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.22.5) + actionpack (= 3.2.22.5) + mail (~> 2.5.4) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -28,22 +28,22 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.4) - arel (3.0.2) + arel (3.0.3) bcrypt-ruby (3.0.1) bootstrap-wysihtml5-rails (0.3.1.19) railties (>= 3.0) @@ -54,6 +54,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) + concurrent-ruby (1.1.10) diff-lcs (1.2.4) erubis (2.7.0) factory_girl (4.2.0) @@ -62,8 +63,9 @@ GEM factory_girl (~> 4.2.0) railties (>= 3.0.0) has_scope (0.5.1) - hike (1.2.2) - i18n (0.6.1) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) inherited_resources (1.4.0) has_scope (~> 0.5.0) responders (~> 0.9) @@ -71,40 +73,39 @@ GEM jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) + json (1.8.6) launchy (2.3.0) addressable (~> 2.3) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.23) - multi_json (1.7.3) + mime-types (1.25.1) + multi_json (1.15.0) nokogiri (1.5.9) - polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.13.0) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) 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.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (= 3.2.22.5) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.4) + rake (13.0.6) rdoc (3.12.2) json (~> 1.4) responders (0.9.3) @@ -120,10 +121,10 @@ GEM rspec-core (~> 2.13.0) rspec-expectations (~> 2.13.0) rspec-mocks (~> 2.13.0) - simple_form (2.1.0) + simple_form (2.1.3) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -133,12 +134,12 @@ GEM actionpack (~> 3.0) activemodel (~> 3.0) railties (~> 3.0) - thor (0.18.1) - tilt (1.4.0) - treetop (1.4.12) + thor (1.2.1) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.61) will_paginate (3.0.4) xpath (2.0.0) nokogiri (~> 1.3)