summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-07 18:07:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-07 18:07:34 +0000
commit8dafc3b65aeb8f50fdfc38fb98d96c3db9e2f607 (patch)
treeecc8ff28071e68108aea21380d80132e388d48bf /changelogs
parentb4028d450087e97f26d4baa23e08396bcbabe3e0 (diff)
downloadgitlab-ce-8dafc3b65aeb8f50fdfc38fb98d96c3db9e2f607.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/22166-fix-sast-template.yml5
-rw-r--r--changelogs/unreleased/39951-fix-dependency-scanning-regex.yml5
-rw-r--r--changelogs/unreleased/remove-ancestor-flag.yml5
3 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/22166-fix-sast-template.yml b/changelogs/unreleased/22166-fix-sast-template.yml
new file mode 100644
index 00000000000..0c5e17b38ec
--- /dev/null
+++ b/changelogs/unreleased/22166-fix-sast-template.yml
@@ -0,0 +1,5 @@
+---
+title: Check both SAST_DISABLE and SAST_DISABLE_DIND when executing SAST job template
+merge_request: 22166
+author:
+type: fixed
diff --git a/changelogs/unreleased/39951-fix-dependency-scanning-regex.yml b/changelogs/unreleased/39951-fix-dependency-scanning-regex.yml
new file mode 100644
index 00000000000..8866b31753c
--- /dev/null
+++ b/changelogs/unreleased/39951-fix-dependency-scanning-regex.yml
@@ -0,0 +1,5 @@
+---
+title: Fix regex matching for gemnasium dependency scanning jobs
+merge_request: 22025
+author: Maximilian Stendler
+type: fix
diff --git a/changelogs/unreleased/remove-ancestor-flag.yml b/changelogs/unreleased/remove-ancestor-flag.yml
new file mode 100644
index 00000000000..2abe15fb720
--- /dev/null
+++ b/changelogs/unreleased/remove-ancestor-flag.yml
@@ -0,0 +1,5 @@
+---
+title: Remove N+1 query issue when checking group root ancestor.
+merge_request:
+author:
+type: performance