diff options
| author | James Lopez <james@jameslopez.es> | 2017-06-25 08:34:06 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-06-25 08:34:06 +0200 |
| commit | 4d70c479107fc502668a83fc369159062d8efbb8 (patch) | |
| tree | c15f975b9197ec8c13aede6ed04601249512e955 | |
| parent | ae9531052392c3f66ddaf82094f88adc456af8e9 (diff) | |
| download | gitlab-ce-4d70c479107fc502668a83fc369159062d8efbb8.tar.gz | |
fix spec failures
| -rw-r--r-- | app/controllers/profiles/emails_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb index 7ea94c59aa7..17b66df43e7 100644 --- a/app/controllers/profiles/emails_controller.rb +++ b/app/controllers/profiles/emails_controller.rb @@ -5,7 +5,7 @@ class Profiles::EmailsController < Profiles::ApplicationController end def create - @email = Emails::CreateService.new(current_user, current_user, email_params).execute + @email = Emails::CreateService.new(current_user, email_params).execute if @email.errors.blank? NotificationService.new.new_email(@email) @@ -19,7 +19,7 @@ class Profiles::EmailsController < Profiles::ApplicationController def destroy @email = current_user.emails.find(params[:id]) - Emails::DestroyService.new(current_user, current_user, email: @email.email).execute + Emails::DestroyService.new(current_user, email: @email.email).execute respond_to do |format| format.html { redirect_to profile_emails_url, status: 302 } diff --git a/app/models/user.rb b/app/models/user.rb index e95334e2542..7a1bce25599 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -494,8 +494,8 @@ class User < ActiveRecord::Base def update_emails_with_primary_email primary_email_record = emails.find_by(email: email) if primary_email_record - Emails::DestroyService.new(self, self, email: email).execute - Emails::CreateService.new(self, self, email: email_was).execute + Emails::DestroyService.new(self, email: email).execute + Emails::CreateService.new(self, email: email_was).execute end end |