diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-05-02 16:02:43 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-05-02 16:02:43 +0000 |
| commit | 59f79383a7f8dadd9c356f3872133e7675dd61c5 (patch) | |
| tree | be37a7cf50e2963ab25721360ad27471370c1868 /changelogs | |
| parent | dbe12754be46786f4ac71d2e45e39f525c74f0cb (diff) | |
| parent | d973872072097152bf16ebb808a2c65912b9f3d0 (diff) | |
| download | gitlab-ce-59f79383a7f8dadd9c356f3872133e7675dd61c5.tar.gz | |
Merge branch 'jprovazn-generic-error' into 'master'
Save and expose only generic merge error
See merge request gitlab-org/gitlab-ce!18646
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/jprovazn-generic-error.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/jprovazn-generic-error.yml b/changelogs/unreleased/jprovazn-generic-error.yml new file mode 100644 index 00000000000..ced3b84fe02 --- /dev/null +++ b/changelogs/unreleased/jprovazn-generic-error.yml @@ -0,0 +1,6 @@ +--- +title: Display only generic message on merge error to avoid exposing any potentially + sensitive or user unfriendly backend messages. +merge_request: +author: +type: fixed |