summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/capistrano.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/bundler/capistrano.rb b/lib/bundler/capistrano.rb
index 6baf87a33b..336f04cacf 100644
--- a/lib/bundler/capistrano.rb
+++ b/lib/bundler/capistrano.rb
@@ -3,12 +3,8 @@
# Just add "require 'bundler/capistrano'" in your Capistrano deploy.rb, and
# Bundler will be activated after each new deployment.
require 'bundler/deployment'
-begin
- require 'capistrano/version'
-rescue LoadError
-end
-if !defined?(Capistrano::Version) || Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
+if defined?(Capistrano::Version) && Gem::Version.new(Capistrano::Version).release >= Gem::Version.new("3.0")
raise "For Capistrano 3.x integration, please use http://github.com/capistrano/bundler"
end