summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAlexandra <brett@digitalmoksha.com>2017-10-01 17:07:26 +0200
committerAlexandra <brett@digitalmoksha.com>2017-10-01 17:07:26 +0200
commited3c25e4294bfc75f7167ed63e30561e39ac3a97 (patch)
tree1c00af6738e0742e9d2140222ebdea669c8b6c37 /app/controllers
parent39fbac868197442053d058023206f84f63473551 (diff)
downloadgitlab-ce-ed3c25e4294bfc75f7167ed63e30561e39ac3a97.tar.gz
spacing and small optimisations
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/confirmations_controller.rb2
-rw-r--r--app/controllers/profiles/emails_controller.rb3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index 51c26b9c17e..62ee9470704 100644
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -10,7 +10,7 @@ class ConfirmationsController < Devise::ConfirmationsController
users_almost_there_path
end
- def after_confirmation_path_for(resource_name, resource)
+ def after_confirmation_path_for(_resource_name, resource)
# incoming resource can either be a :user or an :email
if signed_in?(:user)
after_sign_in_path_for(resource)
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 2c85606c271..3ffe5729c2c 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -2,7 +2,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
before_action :find_email, only: [:destroy, :resend_confirmation_instructions]
def index
- @primary = current_user.email
+ @primary_email = current_user.email
@emails = current_user.emails.order_id_desc
end
@@ -30,6 +30,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
else
flash[:alert] = "There was a problem sending the confirmation email"
end
+
redirect_to profile_emails_url
end