From 039d4a1cbff5b54dc60363ff5f244e84cb54aacf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 21 Nov 2016 17:44:24 +0100
Subject: [PATCH] Fix StrongAttibutes error with Ruby 2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rémy Coutable <remy@rymai.me>
---
lib/api/users.rb | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/api/users.rb b/lib/api/users.rb
index c07539194ed..a73650dc361 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -140,7 +140,8 @@ module API
User.where(username: params[:username]).
where.not(id: user.id).count > 0
- identity_attrs = params.slice(:provider, :extern_uid)
+ user_params = declared_params(include_missing: false)
+ identity_attrs = user_params.slice(:provider, :extern_uid)
if identity_attrs.any?
identity = user.identities.find_by(provider: identity_attrs[:provider])
@@ -154,10 +155,10 @@ module API
end
# Delete already handled parameters
- params.delete(:extern_uid)
- params.delete(:provider)
+ user_params.delete(:extern_uid)
+ user_params.delete(:provider)
- if user.update_attributes(declared_params(include_missing: false))
+ if user.update_attributes(user_params)
present user, with: Entities::UserFull
else
render_validation_error!(user)
--
GitLab