diff --git a/Gemfile.lock b/Gemfile.lock index 4674cb3f..f5c6815f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,36 +9,36 @@ PATH GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) - mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + 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.1) - rack (~> 1.4.0) + journey (~> 1.0.4) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.3) - activesupport (= 3.2.3) + sprockets (~> 2.2.1) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + 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.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) - i18n (~> 0.6) + 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) - arel (3.0.2) + arel (3.0.3) bootstrap-sass (2.1.1.0) - builder (3.0.0) + builder (3.0.4) coderay (1.0.6) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -47,60 +47,61 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.1.10) diff-lcs (1.1.3) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (4.0.2) jquery-rails railties (>= 3.1.0) - json (1.6.6) + json (1.8.6) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) railties (>= 3.0.0) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.7.1) - mime-types (1.18) - multi_json (1.3.2) - polyglot (0.3.3) + mime-types (1.25.1) + multi_json (1.15.0) + polyglot (0.3.5) pry (0.9.9) coderay (~> 1.0.5) method_source (~> 0.7.1) slop (>= 2.4.4, < 3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.13.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + 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.3) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + 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) - rake (0.9.2.2) - rdoc (3.12) + thor (>= 0.14.6, < 2.0) + rake (13.0.6) + rdoc (3.12.2) json (~> 1.4) rr (1.0.4) rspec (2.9.0) @@ -123,17 +124,18 @@ GEM tilt (~> 1.3) slop (2.4.4) spork (0.9.0) - sprockets (2.1.2) + sprockets (2.2.3) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) + thor (1.2.1) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.60) uglifier (2.1.2) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2)