summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/296888-resolve-conflicts-popover-does-not-show.yml
diff options
context:
space:
mode:
Diffstat (limited to 'changelogs/unreleased/296888-resolve-conflicts-popover-does-not-show.yml')
-rw-r--r--changelogs/unreleased/296888-resolve-conflicts-popover-does-not-show.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/296888-resolve-conflicts-popover-does-not-show.yml b/changelogs/unreleased/296888-resolve-conflicts-popover-does-not-show.yml
new file mode 100644
index 00000000000..4ee615c3a42
--- /dev/null
+++ b/changelogs/unreleased/296888-resolve-conflicts-popover-does-not-show.yml
@@ -0,0 +1,5 @@
+---
+title: Hide "Resolve conflicts" button when source branch is protected.
+merge_request: 51121
+author: Marcin Majkowski @marcinmajkowski
+type: added