Skip to content
This repository has been archived by the owner on Aug 1, 2022. It is now read-only.

Capistrano 2.13 #19

Merged
merged 2 commits into from Sep 19, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -22,7 +22,7 @@ gem 'yajl-ruby'
gem 'faraday'
gem 'faraday-stack'
gem 'faraday_middleware'
gem 'capistrano', '~> 2.11'
gem 'capistrano', '~> 2.13'
gem 'capistrano_colors'
gem 'grit'
gem 'dotiw'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Expand Up @@ -35,7 +35,7 @@ GEM
ansible (0.2.0)
arel (3.0.2)
builder (3.0.0)
capistrano (2.11.2)
capistrano (2.13.3)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
Expand Down Expand Up @@ -94,7 +94,7 @@ GEM
guard (>= 0.10.0)
has_scope (0.5.1)
hashie (1.2.0)
highline (1.6.11)
highline (1.6.15)
hike (1.2.1)
i18n (0.6.0)
inherited_resources (1.3.1)
Expand Down Expand Up @@ -129,7 +129,7 @@ GEM
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.3.0)
net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
newrelic_rpm (3.3.3)
Expand Down Expand Up @@ -252,7 +252,7 @@ PLATFORMS
DEPENDENCIES
airbrake
ansible
capistrano (~> 2.11)
capistrano (~> 2.13)
capistrano_colors
coffee-rails (~> 3.2.1)
database_cleaner
Expand Down
16 changes: 0 additions & 16 deletions lib/capistrano_monkey/configuration.rb

This file was deleted.

4 changes: 2 additions & 2 deletions lib/strano/cli.rb
Expand Up @@ -19,7 +19,7 @@ def self.parse(logger, args)

# Override in order to use DB logger
def instantiate_configuration(options={})
config = CapistranoMonkey::Configuration.new(options)
config = Capistrano::Configuration.new(options)
config.logger = logger
config
end
Expand All @@ -37,4 +37,4 @@ def handle_error(error)
end

end
end
end