diff --git a/Gemfile.lock b/Gemfile.lock index 11aa934..cb6b750 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,8 +28,8 @@ GEM activesupport (3.2.1) i18n (~> 0.6) multi_json (~> 1.0) - arel (3.0.2) - builder (3.0.0) + arel (3.0.3) + builder (3.0.4) capistrano (2.9.0) highline net-scp (>= 1.0.0) @@ -39,7 +39,9 @@ GEM chosen-rails (0.9.8) railties (~> 3.0) thor (~> 0.14) - cocaine (0.2.1) + climate_control (0.2.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -47,10 +49,8 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) - coffeebeans (1.0.1) - actionpack (>= 3.0.0) - coffee-script commonjs (0.2.5) + concurrent-ruby (1.1.5) erubis (2.7.0) execjs (1.3.0) multi_json (~> 1.0) @@ -62,7 +62,8 @@ GEM railties (~> 3.0) highline (1.6.11) hike (1.2.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.3) jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) @@ -79,8 +80,9 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.18) - multi_json (1.2.0) + mime-types (1.25.1) + mimemagic (0.3.0) + multi_json (1.14.1) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -89,11 +91,12 @@ GEM net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) nokogiri (1.5.2) - paperclip (2.5.2) - activerecord (>= 2.3.0) - activesupport (>= 2.3.2) - cocaine (>= 0.0.2) + paperclip (4.3.7) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types + mimemagic (= 0.3.0) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -141,7 +144,7 @@ GEM actionpack (>= 3.1) less-rails (~> 2.1.8) railties (>= 3.1) - tzinfo (0.3.32) + tzinfo (0.3.55) uglifier (1.2.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -153,7 +156,6 @@ DEPENDENCIES capistrano chosen-rails coffee-rails (~> 3.2.1) - coffeebeans haml (>= 3.1.4) haml-rails (>= 0.3.4) jquery-rails