diff options
| author | Brett Walker <brett@digitalmoksha.com> | 2017-09-14 16:18:32 +0200 |
|---|---|---|
| committer | Brett Walker <brett@digitalmoksha.com> | 2017-09-23 15:26:04 +0200 |
| commit | a32f1dddf2ed65f3e61ded56256da2996d6442bd (patch) | |
| tree | ff1b82df8738ed7c3ffa21086537bd7c44199ef8 /app | |
| parent | a000c2a1443beb7de0b5193f89916ccce57170c5 (diff) | |
| download | gitlab-ce-a32f1dddf2ed65f3e61ded56256da2996d6442bd.tar.gz | |
fixes for rubocop
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/profiles/emails_controller.rb | 3 | ||||
| -rw-r--r-- | app/services/emails/create_service.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb index 0cd5a7db098..2c85606c271 100644 --- a/app/controllers/profiles/emails_controller.rb +++ b/app/controllers/profiles/emails_controller.rb @@ -1,5 +1,4 @@ class Profiles::EmailsController < Profiles::ApplicationController - before_action :find_email, only: [:destroy, :resend_confirmation_instructions] def index @@ -39,7 +38,7 @@ class Profiles::EmailsController < Profiles::ApplicationController def email_params params.require(:email).permit(:email) end - + def find_email @email = current_user.emails.find(params[:id]) end diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb index 051efd2b2c0..0f6a1e24f02 100644 --- a/app/services/emails/create_service.rb +++ b/app/services/emails/create_service.rb @@ -1,7 +1,7 @@ module Emails class CreateService < ::Emails::BaseService def execute(options = {}) - @user.emails.create({email: @email}.merge(options)) + @user.emails.create({ email: @email }.merge(options)) end end end |