diff --git a/Gemfile.lock b/Gemfile.lock index 7098a74..1b81a69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.12) - actionpack (= 3.2.12) - mail (~> 2.4.4) - actionpack (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + actionmailer (3.2.17) + actionpack (= 3.2.17) + mail (~> 2.5.4) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,22 +14,22 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.12) - activesupport (= 3.2.12) + activemodel (3.2.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - activesupport (3.2.12) - i18n (~> 0.6) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) ambry (0.3.1) - arel (3.0.2) + arel (3.0.3) bcrypt-ruby (3.0.1) builder (3.0.4) capistrano (2.14.1) @@ -46,6 +46,7 @@ GEM execjs coffee-script-source (1.4.0) commonjs (0.2.6) + concurrent-ruby (1.1.7) daemons (1.1.9) devise (2.2.3) bcrypt-ruby (~> 3.0) @@ -67,9 +68,10 @@ GEM gravatar_image_tag (1.1.3) hashie (1.2.0) highline (1.6.15) - hike (1.2.1) + hike (1.2.3) httpauth (0.2.0) - i18n (0.6.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (2.2.0) railties (>= 3.0, < 5.0) @@ -83,14 +85,13 @@ GEM actionpack (>= 3.1) less (~> 2.2.0) libv8 (3.11.8.12) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) merit (1.3.1) ambry (~> 0.3.0) - mime-types (1.21) - multi_json (1.6.0) + mime-types (1.25.1) + multi_json (1.15.0) multipart-post (1.1.5) mysql2 (0.3.11) net-scp (1.1.0) @@ -127,34 +128,34 @@ GEM actionpack activesupport rails (>= 3.0.0) - polyglot (0.3.3) - rack (1.4.5) - rack-cache (1.2) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.12.0) rack (>= 0.4) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - 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.12) - actionmailer (= 3.2.12) - actionpack (= 3.2.12) - activerecord (= 3.2.12) - activeresource (= 3.2.12) - activesupport (= 3.2.12) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) bundler (~> 1.0) - railties (= 3.2.12) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) 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) + rake (13.0.1) + rdoc (3.12.2) json (~> 1.4) ref (1.0.2) ruby-openid (2.2.3) @@ -165,7 +166,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -177,11 +178,11 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.17.0) - tilt (1.3.3) + thor (1.0.1) + tilt (1.4.1) tokenifier (0.1.2) gibberish (~> 1.2) - treetop (1.4.12) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) turbo-sprockets-rails3 (0.3.6) @@ -191,7 +192,7 @@ GEM actionpack (>= 3.1) execjs railties (>= 3.1) - tzinfo (0.3.35) + tzinfo (0.3.57) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2)