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>2021-05-05 09:10:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-05 09:10:38 +0300
commit78bc17257c53bc100a4a1eb07c0fdf032236068f (patch)
treeb74fed64161ca5c0131c26340ee1393187d4c169 /changelogs
parent0fb607f5565c6476c508410914075172ff5899b2 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/271242_fix_n_1_in_custom_emoji_filter.yml5
-rw-r--r--changelogs/unreleased/mc-feature-add-ci-templates-graphql.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/271242_fix_n_1_in_custom_emoji_filter.yml b/changelogs/unreleased/271242_fix_n_1_in_custom_emoji_filter.yml
new file mode 100644
index 00000000000..7b31be4a2dc
--- /dev/null
+++ b/changelogs/unreleased/271242_fix_n_1_in_custom_emoji_filter.yml
@@ -0,0 +1,5 @@
+---
+title: Fix N+1 problem in CustomEmojiFilter
+merge_request: 60910
+author:
+type: performance
diff --git a/changelogs/unreleased/mc-feature-add-ci-templates-graphql.yml b/changelogs/unreleased/mc-feature-add-ci-templates-graphql.yml
new file mode 100644
index 00000000000..a61800908b8
--- /dev/null
+++ b/changelogs/unreleased/mc-feature-add-ci-templates-graphql.yml
@@ -0,0 +1,5 @@
+---
+title: Add CI template field to project GraphQL type.
+merge_request: 60276
+author:
+type: added