Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-06-27 12:47:30 +0300
committerSean McGivern <sean@gitlab.com>2018-06-28 08:14:30 +0300
commit1860ef7dd4675cda33577bf830423697b94cc8fb (patch)
tree6eace466a87140affccf546a0158c0047c0142b1 /app/services
parent87f7597a4fb7852fc81f830158cdfd5fdec8fac4 (diff)
Add extra logging to githost.log when rebasing
Diffstat (limited to 'app/services')
-rw-r--r--app/services/merge_requests/rebase_service.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/services/merge_requests/rebase_service.rb b/app/services/merge_requests/rebase_service.rb
index c0083cd6afd..5b4bc86b9ba 100644
--- a/app/services/merge_requests/rebase_service.rb
+++ b/app/services/merge_requests/rebase_service.rb
@@ -18,10 +18,18 @@ module MergeRequests
return false
end
+ log_prefix = "#{self.class.name} info (#{merge_request.to_reference(full: true)}):"
+
+ Gitlab::GitLogger.info("#{log_prefix} rebase started")
+
rebase_sha = repository.rebase(current_user, merge_request)
+ Gitlab::GitLogger.info("#{log_prefix} rebased to #{rebase_sha}")
+
merge_request.update_attributes(rebase_commit_sha: rebase_sha)
+ Gitlab::GitLogger.info("#{log_prefix} rebase SHA saved: #{rebase_sha}")
+
true
rescue => e
log_error(REBASE_ERROR, save_message_on_model: true)