summaryrefslogtreecommitdiff
path: root/app/controllers/profiles_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-27 10:32:37 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-27 10:32:37 +0200
commitb2e4664cc78d61ec058e81f37cdff11636b02967 (patch)
tree090ad0589d9b7cbd40cbbc17c2b118f3bbf4214a /app/controllers/profiles_controller.rb
parent44c55307a0dc1d011cb9deabb2f1d631ebd2cb63 (diff)
downloadgitlab-ce-b2e4664cc78d61ec058e81f37cdff11636b02967.tar.gz
Read-only email field for LDAP user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/profiles_controller.rb')
-rw-r--r--app/controllers/profiles_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
index 47cfc5e63f5..9234cd1708f 100644
--- a/app/controllers/profiles_controller.rb
+++ b/app/controllers/profiles_controller.rb
@@ -13,6 +13,8 @@ class ProfilesController < ApplicationController
end
def update
+ params[:user].delete(:email) if @user.ldap_user?
+
if @user.update_attributes(params[:user])
flash[:notice] = "Profile was successfully updated"
else