Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'changelogs/unreleased/pks-resolve-conflicts-drop-ruby-implementation.yml')
-rw-r--r--changelogs/unreleased/pks-resolve-conflicts-drop-ruby-implementation.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/pks-resolve-conflicts-drop-ruby-implementation.yml b/changelogs/unreleased/pks-resolve-conflicts-drop-ruby-implementation.yml
new file mode 100644
index 000000000..ea400bfc9
--- /dev/null
+++ b/changelogs/unreleased/pks-resolve-conflicts-drop-ruby-implementation.yml
@@ -0,0 +1,5 @@
+---
+title: 'conflicts: Drop ResolveConflicts feature flag'
+merge_request: 3410
+author:
+type: performance