summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorAlexander Keramidas <dev.alexkeramidas@gmail.com>2017-08-29 11:57:41 +0300
committerAlexander Keramidas <dev.alexkeramidas@gmail.com>2017-09-06 16:38:52 +0300
commit4df54f260751a832ebf0b8c18524020d6604994b (patch)
tree2337fd9cc3fe1a1c82d9cc980dcce22465e493ce /app/services
parent021fb512e3c3f4b317307358dee8eecf448599b0 (diff)
downloadgitlab-ce-4df54f260751a832ebf0b8c18524020d6604994b.tar.gz
Profile updates from providers
Diffstat (limited to 'app/services')
-rw-r--r--app/services/users/update_service.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index 2f9855273dc..6188b8a4349 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -34,6 +34,10 @@ module Users
private
def assign_attributes(&block)
+ if @user.user_synced_attributes_metadata
+ params.except!(*@user.user_synced_attributes_metadata.read_only_attributes)
+ end
+
@user.assign_attributes(params) if params.any?
end
end