diff --git a/Gemfile.lock b/Gemfile.lock index 7245c24..55d884f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ 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.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,19 +14,19 @@ 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.17) + activesupport (= 3.2.17) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) 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.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) arel (3.0.3) builder (3.0.4) @@ -48,6 +48,7 @@ GEM execjs coffee-script-source (1.9.1.1) commonjs (0.2.7) + concurrent-ruby (1.1.6) diff-lcs (1.2.5) docile (1.1.5) eco (1.0.0) @@ -72,7 +73,8 @@ GEM has_scope (0.5.1) highline (1.7.2) hike (1.2.3) - i18n (0.6.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) @@ -80,7 +82,7 @@ GEM js-routes (0.9.7) railties (>= 3.2) sprockets-rails - json (1.8.2) + json (1.8.6) kgio (2.9.3) less (2.4.0) commonjs (~> 0.2.7) @@ -88,11 +90,11 @@ GEM actionpack (>= 3.1) less (~> 2.4.0) libv8 (3.16.14.7) - mail (2.5.4) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - multi_json (1.11.0) + multi_json (1.14.1) net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -105,29 +107,29 @@ GEM polyglot (0.3.5) rabl (0.9.3) activesupport (>= 2.3.14) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) rack-ssl (1.3.4) rack 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.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.13) + railties (= 3.2.17) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.3) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -172,7 +174,7 @@ GEM therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.19.1) + thor (0.19.4) tilt (1.4.1) treetop (1.4.15) polyglot @@ -182,7 +184,7 @@ GEM execjs rails (>= 3.1) railties (>= 3.1) - tzinfo (0.3.43) + tzinfo (0.3.56) uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) @@ -214,7 +216,7 @@ DEPENDENCIES oj (= 2.5.5) pg (= 0.17.1) rabl (= 0.9.3) - rails (= 3.2.13) + rails (= 3.2.17) rails_12factor rake rspec-rails (= 2.14.1)