summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-01-09 16:49:39 +0100
committerJan Provaznik <jprovaznik@gitlab.com>2018-01-09 17:04:28 +0100
commita560f785f7f34b932c285365790a27d15bd100ec (patch)
tree62a54db8a361c25b4afdae140c3895f48a1d8a0e /changelogs
parent678a00d60a21fcd39fa5c8043fadc4a94e618f4d (diff)
downloadgitlab-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 'changelogs')
-rw-r--r--changelogs/unreleased/4020-rebase-message.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/4020-rebase-message.yml b/changelogs/unreleased/4020-rebase-message.yml
new file mode 100644
index 00000000000..4793f3d9cb9
--- /dev/null
+++ b/changelogs/unreleased/4020-rebase-message.yml
@@ -0,0 +1,5 @@
+---
+title: Display user friendly error message if rebase fails.
+merge_request:
+author:
+type: fixed