Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cf485633
Commit
cf485633
authored
Aug 26, 2019
by
Aishwarya Subramanian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added routes for trial registration api
parent
94490b63
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
app/services/users/build_service.rb
app/services/users/build_service.rb
+7
-1
config/routes.rb
config/routes.rb
+4
-0
No files found.
app/services/users/build_service.rb
View file @
cf485633
...
...
@@ -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
)
...
...
config/routes.rb
View file @
cf485633
...
...
@@ -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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment