Commit 3ce7caac

@@ -6,6 +6,7 @@ set :rvm_type, :system
 set :stages, %w(production staging)
 set :default_stage, "staging"
 require 'capistrano/ext/multistage'
+require 'capistrano/gitflow'
 set :application, "www.cakeside.com"
 set :deploy_via, :remote_cache
 set :user, "cakeside"
@@ -18,7 +19,7 @@ set :deploy_to, "/home/cakeside/apps/#{application}"
 set :scm, :git
 set :repository,  "git@bitbucket.org:mocheen/cakeside.git"
 set :keep_releases, 3
-set :branch, ENV["branch"] || "master"
+set :branch, "master"
 set :deploy_env, 'production'
 set :scm_verbose, true
 

@@ -16,6 +16,7 @@ gem 'kaminari'
 gem 'capistrano'
 gem 'capistrano-ext'
 gem 'rvm-capistrano'
+gem 'capistrano-gitflow'
 gem 'exception_notification'
 gem "formtastic", "~> 2.1.1"
 gem 'activeadmin'

@@ -56,6 +56,9 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
+    capistrano-gitflow (1.4.3)
+      capistrano
+      stringex
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -232,6 +235,7 @@ GEM
     sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
+    stringex (1.4.0)
     thinking-sphinx (2.0.11)
       activerecord (>= 3.0.3)
       builder (>= 2.1.2)
@@ -267,6 +271,7 @@ DEPENDENCIES
   bourbon (= 1.4.0)
   capistrano
   capistrano-ext
+  capistrano-gitflow
   capybara
   carrierwave
   coffee-rails