lib/heroku_deploy/tasks.rb in heroku_deploy-0.0.11 vs lib/heroku_deploy/tasks.rb in heroku_deploy-0.0.12
- old
+ new
@@ -65,11 +65,11 @@
task :staging => :environment do
heroku_deploy.backup( staging_app )
puts "Deploying to Staging"
- merge( "master", "staging" )
+ heroku_deploy.merge( "master", "staging" )
heroku_deploy.push_to 'staging', staging_app
puts ""
puts "Staging Deployed!"
puts ""
@@ -79,10 +79,10 @@
task :production => :environment do
heroku_deploy.backup( production_app )
puts "Deploying to Production"
- merge( "staging", "production" )
+ heroku_deploy.merge( "staging", "production" )
heroku_deploy.push_to 'production', production_app
puts ""
puts "Production Deployed!"
\ No newline at end of file