summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-25 18:08:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-25 18:08:10 +0000
commit5d75b2b9a9d11c20667895e6aa68ea4e76658c5d (patch)
tree2aa529b0a153c805f5f4ecb357321a4e4f4c59cb /changelogs
parent6f2065c468b05658125b746169c56764a8ccddb1 (diff)
downloadgitlab-ce-5d75b2b9a9d11c20667895e6aa68ea4e76658c5d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/211818-enable-streaming-serializer-ff.yml5
-rw-r--r--changelogs/unreleased/dblessing_okta_scim.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/211818-enable-streaming-serializer-ff.yml b/changelogs/unreleased/211818-enable-streaming-serializer-ff.yml
new file mode 100644
index 00000000000..d0f420d0c26
--- /dev/null
+++ b/changelogs/unreleased/211818-enable-streaming-serializer-ff.yml
@@ -0,0 +1,5 @@
+---
+title: Enable streaming serializer feature flag by default.
+merge_request: 27813
+author:
+type: performance
diff --git a/changelogs/unreleased/dblessing_okta_scim.yml b/changelogs/unreleased/dblessing_okta_scim.yml
new file mode 100644
index 00000000000..16baae42004
--- /dev/null
+++ b/changelogs/unreleased/dblessing_okta_scim.yml
@@ -0,0 +1,5 @@
+---
+title: Add support for Okta as a SCIM provider
+merge_request: 25649
+author:
+type: added