diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-08-12 12:27:45 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-08-12 12:27:45 +0300 |
| commit | c85cbc08f7fc43819f7569b7686ee22ce747e7b3 (patch) | |
| tree | 7054cb20736b1a8169761c2807d52e59c40f6912 /changelogs | |
| parent | 0d9068b4a0b98272c90c644514756f7d93fd3b0a (diff) | |
| parent | 45064348619ce7585d15756950eae5f5346ee631 (diff) | |
Merge branch '44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie' into 'master'
Fix incorrectly displayed conflict warning
See merge request gitlab-org/gitlab-ce!31469
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie.yml b/changelogs/unreleased/44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie.yml new file mode 100644 index 00000000000..674d53286e6 --- /dev/null +++ b/changelogs/unreleased/44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie.yml @@ -0,0 +1,5 @@ +--- +title: Fix flashing conflict warning when editing issues +merge_request: 31469 +author: +type: fixed |