Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

3 files changed, 16 insertions, 13 deletions

diff --git a/lib/gitlab/external_authorization/access.rb b/lib/gitlab/external_authorization/access.rb
index e111c41fcc2..21fa728fd3a 100644
--- a/lib/gitlab/external_authorization/access.rb
+++ b/lib/gitlab/external_authorization/access.rb
@@ -10,7 +10,8 @@ module Gitlab
                   :load_type
 
       def initialize(user, label)
-        @user, @label = user, label
+        @user = user
+        @label = label
       end
 
       def loaded?
diff --git a/lib/gitlab/external_authorization/cache.rb b/lib/gitlab/external_authorization/cache.rb
index acdc028b4dc..509daeb0248 100644
--- a/lib/gitlab/external_authorization/cache.rb
+++ b/lib/gitlab/external_authorization/cache.rb
@@ -6,7 +6,8 @@ module Gitlab
       VALIDITY_TIME = 6.hours
 
       def initialize(user, label)
-        @user, @label = user, label
+        @user = user
+        @label = label
       end
 
       def load
diff --git a/lib/gitlab/external_authorization/client.rb b/lib/gitlab/external_authorization/client.rb
index fc859304eab..582051010d3 100644
--- a/lib/gitlab/external_authorization/client.rb
+++ b/lib/gitlab/external_authorization/client.rb
@@ -13,7 +13,8 @@ module Gitlab
       }.freeze
 
       def initialize(user, label)
-        @user, @label = user, label
+        @user = user
+        @label = label
       end
 
       def request_access
@@ -51,18 +52,18 @@ module Gitlab
 
       def body
         @body ||= begin
-                    body = {
-                      user_identifier: @user.email,
-                      project_classification_label: @label,
-                      identities: @user.identities.map { |identity| { provider: identity.provider, extern_uid: identity.extern_uid } }
-                    }
+          body = {
+            user_identifier: @user.email,
+            project_classification_label: @label,
+            identities: @user.identities.map { |identity| { provider: identity.provider, extern_uid: identity.extern_uid } }
+          }
 
-                    if @user.ldap_identity
-                      body[:user_ldap_dn] = @user.ldap_identity.extern_uid
-                    end
+          if @user.ldap_identity
+            body[:user_ldap_dn] = @user.ldap_identity.extern_uid
+          end
 
-                    body
-                  end
+          body
+        end
       end
     end
   end