diff options
author | Rémy Coutable <remy@rymai.me> | 2016-11-18 09:54:16 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-11-18 09:54:16 +0000 |
commit | e252ee5bbf7481e28dd66659940ab6d4ba72b972 (patch) | |
tree | 8eac6e6ae00256274a446a5bb953c805d63f49ce | |
parent | 492ead3f715d2bfefad25190d98803f41307021f (diff) | |
parent | ed1cd9885828e820095374d56d79604b8cc94858 (diff) | |
download | gitlab-ce-e252ee5bbf7481e28dd66659940ab6d4ba72b972.tar.gz |
Merge branch 'namespace-validation' into 'master'
Check all namespaces on validation of new username.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24519 and https://gitlab.com/gitlab-org/gitlab-ce/issues/24580
See merge request !7537
-rw-r--r-- | app/controllers/users_controller.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/namespace-validation.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c4508ccc3b9..6e29f1e8a65 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -86,7 +86,7 @@ class UsersController < ApplicationController end def exists - render json: { exists: Namespace.where(path: params[:username].downcase).any? } + render json: { exists: !!Namespace.find_by_path_or_name(params[:username]) } end private diff --git a/changelogs/unreleased/namespace-validation.yml b/changelogs/unreleased/namespace-validation.yml new file mode 100644 index 00000000000..6ac461bf82e --- /dev/null +++ b/changelogs/unreleased/namespace-validation.yml @@ -0,0 +1,4 @@ +--- +title: Check all namespaces on validation of new username. +merge_request: 7537 +author: |