From 9c2853eae8b8cf904ee22d70339155bf98dc510b Mon Sep 17 00:00:00 2001 From: chiu Date: Wed, 18 Mar 2020 13:36:33 +0800 Subject: [PATCH] auto fix update error --- temp_file/app/controllers/admin/sites_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/temp_file/app/controllers/admin/sites_controller.rb b/temp_file/app/controllers/admin/sites_controller.rb index 1c0e91c..9259560 100644 --- a/temp_file/app/controllers/admin/sites_controller.rb +++ b/temp_file/app/controllers/admin/sites_controller.rb @@ -188,7 +188,7 @@ class Admin::SitesController < OrbitAdminController if %x[#{git} config user.email].empty? %x[#{git} config --global user.email "orbit@rulingcom.com"] end - Bundler.with_clean_env{system("#{git_add_except_public} ; #{git} commit -m auto_backup_before_#{type}_#{time_now} && #{git} reset #{commit} --mixed ; #{git_add_custom} ; #{git_restore} ; #{git_add_except_public} ; #{git} commit -m complete_#{type}_#{time_now}")} + Bundler.with_clean_env{system("#{git_add_except_public} ; #{git} commit -m auto_backup_before_#{type}_#{time_now} --allow-empty && #{git} reset #{commit} --mixed ; #{git_add_custom} ; #{git_restore} ; #{git_add_except_public} ; #{git} commit -m complete_#{type}_#{time_now} --allow-empty")} mul.update_attributes(status: 'finish') end end