Commit d563c455 authored by Michael Kozono's avatar Michael Kozono

Clean up EE overrides

parent a1a17ac3
......@@ -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'
......
......@@ -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
......
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment