summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-08-02 14:46:32 +0000
committerRémy Coutable <remy@rymai.me>2017-08-02 14:46:32 +0000
commit42aa9311be0245ad4237b8873c957bafda82f33e (patch)
treec057e9e0fb40e3afed6ed39b4855ed9289e35279 /changelogs
parentcb5adbab70114c14c157dab84838faf28995d7ba (diff)
parent71951fc38c080579f9270d0c7a80bb3330483886 (diff)
downloadgitlab-ce-42aa9311be0245ad4237b8873c957bafda82f33e.tar.gz
Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master'
Uniquify reserved word usernames on OAuth user creation See merge request !13244
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/handle-reserved-words-for-oauth-usernames.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/handle-reserved-words-for-oauth-usernames.yml b/changelogs/unreleased/handle-reserved-words-for-oauth-usernames.yml
new file mode 100644
index 00000000000..0d64844a2b8
--- /dev/null
+++ b/changelogs/unreleased/handle-reserved-words-for-oauth-usernames.yml
@@ -0,0 +1,4 @@
+---
+title: Uniquify reserved word usernames on OAuth user creation
+merge_request: 13244
+author: Robin Bobbitt