Commit 941756c5 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'add-more-rebase-logging' into 'master'

Add extra logging to githost.log when rebasing

See merge request gitlab-org/gitlab-ce!20202
parents dbbd8d05 1860ef7d
......@@ -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)
......
---
title: Add more detailed logging to githost.log when rebasing
merge_request:
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment