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
d563c455
Commit
d563c455
authored
Aug 08, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up EE overrides
parent
a1a17ac3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
17 deletions
+5
-17
ee/app/controllers/ee/registrations_controller.rb
ee/app/controllers/ee/registrations_controller.rb
+0
-2
ee/app/services/ee/system_hooks_service.rb
ee/app/services/ee/system_hooks_service.rb
+1
-9
ee/app/services/ee/users/build_service.rb
ee/app/services/ee/users/build_service.rb
+4
-6
No files found.
ee/app/controllers/ee/registrations_controller.rb
View file @
d563c455
...
...
@@ -5,8 +5,6 @@ module EE
private
def
sign_up_params
raise
NotImplementedError
unless
defined?
(
super
)
clean_params
=
params
.
require
(
:user
).
permit
(
:username
,
:email
,
:email_confirmation
,
:name
,
:password
,
:email_opted_in
)
if
clean_params
[
:email_opted_in
]
==
'1'
...
...
ee/app/services/ee/system_hooks_service.rb
View file @
d563c455
...
...
@@ -5,15 +5,7 @@ module EE
private
def
user_data
(
model
)
raise
NotImplementedError
unless
defined?
(
super
)
data
=
{
name:
model
.
name
,
email:
model
.
email
,
user_id:
model
.
id
,
username:
model
.
username
}
data
=
super
data
.
merge!
(
email_opted_in_data
(
model
))
if
::
Gitlab
.
com?
data
end
...
...
ee/app/services/ee/users/build_service.rb
View file @
d563c455
...
...
@@ -4,13 +4,11 @@ module EE
private
def
signup_params
super
+
email_opted_in_params
end
def
email_opted_in_params
[
:email
,
:email_confirmation
,
:password_automatically_set
,
:name
,
:password
,
:username
,
:email_opted_in
,
:email_opted_in_ip
,
:email_opted_in_source_id
,
...
...
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