diff --git a/Gemfile b/Gemfile index 6727db5..06e23a6 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ group :development, :test do end group :development do - gem 'capistrano' + gem 'capistrano', '~> 2.0', :require => false # better errors gem 'better_errors' diff --git a/Gemfile.lock b/Gemfile.lock index 57cd066..6a00bf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,16 +8,16 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.14) - actionpack (= 3.2.14) + actionmailer (3.2.15) + actionpack (= 3.2.15) mail (~> 2.5.4) actionmailer_inline_css (1.5.3) actionmailer (>= 3.0.0) nokogiri (>= 1.4.4) premailer (>= 1.7.1) - actionpack (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) + actionpack (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -25,18 +25,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.14) - activesupport (= 3.2.14) + activemodel (3.2.15) + activesupport (= 3.2.15) builder (~> 3.0.0) - activerecord (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) + activerecord (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.14) - activemodel (= 3.2.14) - activesupport (= 3.2.14) - activesupport (3.2.14) + activeresource (3.2.15) + activemodel (= 3.2.15) + activesupport (= 3.2.15) + activesupport (3.2.15) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.5) @@ -85,7 +85,7 @@ GEM safe_yaml (~> 0.9.0) css_parser (1.3.5) addressable - database_cleaner (1.1.1) + database_cleaner (1.2.0) debug_inspector (0.0.2) debugger (1.6.2) columnize (>= 0.3.1) @@ -106,7 +106,7 @@ GEM launchy (~> 2.1) mail (~> 2.2) erubis (2.7.0) - execjs (2.0.1) + execjs (2.0.2) fabrication (2.8.1) faraday (0.8.8) multipart-post (~> 1.2.0) @@ -134,8 +134,8 @@ GEM activesupport builder htmlentities (4.3.1) - httparty (0.11.0) - multi_json (~> 1.0) + httparty (0.12.0) + json (~> 1.8) multi_xml (>= 0.5.2) httpauth (0.2.0) i18n (0.6.5) @@ -187,7 +187,7 @@ GEM rails (>= 3.2.0) railties (>= 3.2.0) moped (1.5.1) - multi_json (1.8.1) + multi_json (1.8.2) multi_xml (0.5.5) multipart-post (1.2.0) net-scp (1.1.2) @@ -199,7 +199,7 @@ GEM net-ssh (>= 2.6.5) netrc (0.7.7) nokogiri (1.5.10) - nokogiri-happymapper (0.5.7) + nokogiri-happymapper (0.5.8) nokogiri (~> 1.5) oauth (0.4.7) oauth2 (0.8.1) @@ -264,19 +264,19 @@ GEM rack-ssl-enforcer (0.2.6) rack-test (0.6.2) rack (>= 1.0) - rails (3.2.14) - actionmailer (= 3.2.14) - actionpack (= 3.2.14) - activerecord (= 3.2.14) - activeresource (= 3.2.14) - activesupport (= 3.2.14) + rails (3.2.15) + actionmailer (= 3.2.15) + actionpack (= 3.2.15) + activerecord (= 3.2.15) + activeresource (= 3.2.15) + activesupport (= 3.2.15) bundler (~> 1.0) - railties (= 3.2.14) + railties (= 3.2.15) rails_autolink (1.1.4) rails (> 3.1) - railties (3.2.14) - actionpack (= 3.2.14) - activesupport (= 3.2.14) + railties (3.2.15) + actionpack (= 3.2.15) + activesupport (= 3.2.15) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -294,10 +294,10 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - rspec-core (2.14.5) + rspec-core (2.14.6) rspec-expectations (2.14.3) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.3) + rspec-mocks (2.14.4) rspec-rails (2.14.0) actionpack (>= 3.0) activesupport (>= 3.0) @@ -348,29 +348,29 @@ GEM atomic tilt (1.4.1) timecop (0.6.3) - tins (0.11.0) + tins (0.12.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) turbo-sprockets-rails3 (0.3.10) railties (> 3.2.8, < 4.0.0) sprockets (>= 2.0.0) - tzinfo (0.3.37) + tzinfo (0.3.38) uglifier (2.2.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - underscore-rails (1.5.1) + underscore-rails (1.5.2) unicorn (4.6.3) kgio (~> 2.6) rack raindrops (~> 0.7) - useragent (0.7.0) + useragent (0.8.3) warden (1.2.3) rack (>= 1.0) - webmock (1.13.0) + webmock (1.15.0) addressable (>= 2.2.7) crack (>= 0.3.2) - xmpp4r (0.5) + xmpp4r (0.5.5) xpath (2.0.0) nokogiri (~> 1.3) yajl-ruby (1.1.0) @@ -387,7 +387,7 @@ DEPENDENCIES binding_of_caller bitbucket_rest_api campy - capistrano + capistrano (~> 2.0) capybara coveralls database_cleaner -- libgit2 0.21.2