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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 06:09:15 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-07 06:09:15 +0300
commit7ba5b9babaa5802c39e686c57cbf4a3f4725c4b0 (patch)
tree03a696c26f32e46faa46dd12d0a937d1d0d1cba4 /changelogs
parentb56027c9d80ac0e297ba8a43c81e8504172dbf9f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/213062-disallow-distinct-count-for-the-ordinary-batch-counter.yml5
-rw-r--r--changelogs/unreleased/32737-make-mergeservice-idempotent.yml5
2 files changed, 5 insertions, 5 deletions
diff --git a/changelogs/unreleased/213062-disallow-distinct-count-for-the-ordinary-batch-counter.yml b/changelogs/unreleased/213062-disallow-distinct-count-for-the-ordinary-batch-counter.yml
new file mode 100644
index 00000000000..d219b6a52c2
--- /dev/null
+++ b/changelogs/unreleased/213062-disallow-distinct-count-for-the-ordinary-batch-counter.yml
@@ -0,0 +1,5 @@
+---
+title: Disallow distinct count for regular batch count
+merge_request: 28518
+author:
+type: performance
diff --git a/changelogs/unreleased/32737-make-mergeservice-idempotent.yml b/changelogs/unreleased/32737-make-mergeservice-idempotent.yml
deleted file mode 100644
index 5f434df2165..00000000000
--- a/changelogs/unreleased/32737-make-mergeservice-idempotent.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make MergeService idempotent
-merge_request: 24708
-author:
-type: changed