diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb index a3b3384..5e355b0 100644 --- a/app/controllers/admin/sites_controller.rb +++ b/app/controllers/admin/sites_controller.rb @@ -131,6 +131,7 @@ class Admin::SitesController < OrbitBackendController %x(git stash) unless need_stash %x(git fetch origin) pull_result = %x(git pull -r --ff-only 2>&1 origin #{@branch}) + %x(git stash pop) unless need_stash if pull_result.include? "fatal: Not possible to fast-forward, aborting." result = "failed" @@ -138,7 +139,6 @@ class Admin::SitesController < OrbitBackendController result = "success" Bundler.with_clean_env { `cd #{Rails.root} && bundle install && touch tmp/restart.txt` } end - %x(git stash pop) unless need_stash render :text => result end