diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 11:05:38 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 11:05:38 +0000 |
| commit | d3f26be6f08cd0656589306eb06991b93d1c5825 (patch) | |
| tree | d00b4dbcaacfe281f6493b03b5e8f17d28c7de24 /changelogs | |
| parent | 2a0d6342912472b7ab9fa0036bd764841b388e7d (diff) | |
| parent | 85e0b99471b58078e1e50494ae26eb13430d3a9f (diff) | |
| download | gitlab-ce-d3f26be6f08cd0656589306eb06991b93d1c5825.tar.gz | |
Merge branch '23524-notify-automerge-user-of-failed-build' into 'master'
Notify the user who set auto-merge when merge is not possible
Closes #23524
See merge request !8056
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml b/changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml new file mode 100644 index 00000000000..268be6b9b83 --- /dev/null +++ b/changelogs/unreleased/23524-notify-automerge-user-of-failed-build.yml @@ -0,0 +1,4 @@ +--- +title: Create a TODO for user who set auto-merge when a build fails, merge conflict occurs +merge_request: 8056 +author: twonegatives |