Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Bobbitt <ryehle@us.ibm.com>2017-06-06 18:39:54 +0300
committerRobin Bobbitt <ryehle@us.ibm.com>2017-06-07 18:13:57 +0300
commit469acd190e497cda8516da0ee481f33e038d7e9e (patch)
tree7b2fd577757c49570fc353a02a23533a0674d8fa /app/controllers
parent8fdba5fac2a5fb4ce17a11580e94a85257e76e2c (diff)
Sync email address from specified omniauth provider
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/profiles_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 8cd1c47eb3f..72f34930ca8 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -9,7 +9,7 @@ class ProfilesController < Profiles::ApplicationController
end
def update
- user_params.except!(:email) if @user.ldap_user?
+ user_params.except!(:email) if @user.external_email?
respond_to do |format|
if @user.update_attributes(user_params)
@@ -76,7 +76,7 @@ class ProfilesController < Profiles::ApplicationController
end
def user_params
- params.require(:user).permit(
+ @user_params ||= params.require(:user).permit(
:avatar,
:bio,
:email,