diff options
author | Aishwarya Subramanian <asubramanian@gitlab.com> | 2019-08-26 21:53:38 +0530 |
---|---|---|
committer | Aishwarya Subramanian <asubramanian@gitlab.com> | 2019-08-26 21:53:38 +0530 |
commit | cf4856337d50ca3eab59a34e8d5a10441999a920 (patch) | |
tree | 90b1695f96a7d7e3594d7c88df9942d7580a8f7b | |
parent | 94490b63b3c40af9c73db10161f1f5905165309b (diff) | |
download | gitlab-ce-cf4856337d50ca3eab59a34e8d5a10441999a920.tar.gz |
Added routes for trial registration api
-rw-r--r-- | app/services/users/build_service.rb | 8 | ||||
-rw-r--r-- | config/routes.rb | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/services/users/build_service.rb b/app/services/users/build_service.rb index 026bcfcdaf4..c853d6fce33 100644 --- a/app/services/users/build_service.rb +++ b/app/services/users/build_service.rb @@ -87,7 +87,9 @@ module Users :password_automatically_set, :name, :password, - :username + :username, + :first_name, + :last_name ] end @@ -107,6 +109,10 @@ module Users if user_params[:skip_confirmation].nil? user_params[:skip_confirmation] = skip_user_confirmation_email_from_setting end + + if (user_params[:first_name].present? || user_params[:last_name].present?) && !user_params[:name].present? + user_params[:name] = "#{user_params[:first_name]} #{user_params[:last_name]}" + end end if user_default_internal_regex_enabled? && !user_params.key?(:external) diff --git a/config/routes.rb b/config/routes.rb index d633228a495..3cdb0328604 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -188,6 +188,10 @@ Rails.application.routes.draw do draw :user draw :project + Gitlab.ee do + draw :trial_registration + end + root to: "root#index" get '*unmatched_route', to: 'application#route_not_found' |