diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-01-09 16:49:39 +0100 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-01-09 17:04:28 +0100 |
commit | a560f785f7f34b932c285365790a27d15bd100ec (patch) | |
tree | 62a54db8a361c25b4afdae140c3895f48a1d8a0e /app/services | |
parent | 678a00d60a21fcd39fa5c8043fadc4a94e618f4d (diff) | |
download | gitlab-ce-a560f785f7f34b932c285365790a27d15bd100ec.tar.gz |
Store only generic message if rebase fails4020-rebase-message
Instead of storing detailed rebase error, only a generic message is
stored with MR. The reason is that this message is exposed and displayed
to end user and there is no reason to expose detailed backend
information. Error message is still logged so detailed information
can be found in logfile by admin if needed.
Related #41820
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/merge_requests/rebase_service.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/merge_requests/rebase_service.rb b/app/services/merge_requests/rebase_service.rb index 0d5a25fa28e..c0083cd6afd 100644 --- a/app/services/merge_requests/rebase_service.rb +++ b/app/services/merge_requests/rebase_service.rb @@ -1,12 +1,14 @@ module MergeRequests class RebaseService < MergeRequests::WorkingCopyBaseService + REBASE_ERROR = 'Rebase failed. Please rebase locally'.freeze + def execute(merge_request) @merge_request = merge_request if rebase success else - error('Failed to rebase. Should be done manually') + error(REBASE_ERROR) end end @@ -22,8 +24,8 @@ module MergeRequests true rescue => e - log_error('Failed to rebase branch:') - log_error(e.message, save_message_on_model: true) + log_error(REBASE_ERROR, save_message_on_model: true) + log_error(e.message) false end end |