Merge branch 'add-more-rebase-logging' into 'master'
Add extra logging to githost.log when rebasing See merge request gitlab-org/gitlab-ce!20202
This commit is contained in:
commit
941756c59f
2 changed files with 13 additions and 0 deletions
|
@ -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)
|
||||
|
|
5
changelogs/unreleased/add-more-rebase-logging.yml
Normal file
5
changelogs/unreleased/add-more-rebase-logging.yml
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Add more detailed logging to githost.log when rebasing
|
||||
merge_request:
|
||||
author:
|
||||
type: other
|
Loading…
Reference in a new issue