summaryrefslogtreecommitdiff
path: root/changelogs/unreleased
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2018-06-13 17:49:25 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2018-06-13 17:49:25 +0000
commit662276be52e477c0d0c61adb02a6f356843787f1 (patch)
treed0e8c327e93953b82ad467e9718023b5eea36234 /changelogs/unreleased
parent70891b79cf576ac22d35e85fac49a3cac31e0d3a (diff)
parentda1792488405d6a93a8cbc1d2cbde64d97a7d07f (diff)
downloadgitlab-ce-662276be52e477c0d0c61adb02a6f356843787f1.tar.gz
Merge branch '11-0-stable-prepare-rc11' into '11-0-stable'
Prepare 11.0 RC11 release See merge request gitlab-org/gitlab-ce!19761
Diffstat (limited to 'changelogs/unreleased')
-rw-r--r--changelogs/unreleased/bvl-terms-on-registration.yml5
-rw-r--r--changelogs/unreleased/fj-restore-users-v3-endpoint.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/bvl-terms-on-registration.yml b/changelogs/unreleased/bvl-terms-on-registration.yml
new file mode 100644
index 00000000000..3e6e499dd02
--- /dev/null
+++ b/changelogs/unreleased/bvl-terms-on-registration.yml
@@ -0,0 +1,5 @@
+---
+title: Users can accept terms during registration
+merge_request: 19583
+author:
+type: other
diff --git a/changelogs/unreleased/fj-restore-users-v3-endpoint.yml b/changelogs/unreleased/fj-restore-users-v3-endpoint.yml
new file mode 100644
index 00000000000..c5f952dfa88
--- /dev/null
+++ b/changelogs/unreleased/fj-restore-users-v3-endpoint.yml
@@ -0,0 +1,5 @@
+---
+title: Restore API v3 user endpoint
+merge_request:
+author:
+type: changed