diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-06-12 20:51:32 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-06-12 20:51:32 +0300 |
| commit | d78a4465fafe6f0bb5e197649a0721f35a069bbd (patch) | |
| tree | e3d5ff3ff4e8df1c951bdd8ffa58d1de44c19dce /changelogs | |
| parent | 09419668dd164fd9a4e74d0fc938be6ee823875c (diff) | |
| parent | 1405b9cd50ba956c866c41dfc5e7a6758e148d0c (diff) | |
Merge branch 'sh-fix-resolve-button-not-available' into 'master'
Fix "Resolve conflicts" button not appearing for some users
Closes #47954
See merge request gitlab-org/gitlab-ce!29535
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/sh-fix-resolve-button-not-available.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-resolve-button-not-available.yml b/changelogs/unreleased/sh-fix-resolve-button-not-available.yml new file mode 100644 index 00000000000..85a9007f570 --- /dev/null +++ b/changelogs/unreleased/sh-fix-resolve-button-not-available.yml @@ -0,0 +1,5 @@ +--- +title: Fix "Resolve conflicts" button not appearing for some users +merge_request: 29535 +author: +type: fixed |