Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

3 files changed, 14 insertions, 7 deletions

diff --git a/lib/gitlab/auth/current_user_mode.rb b/lib/gitlab/auth/current_user_mode.rb
index 0f327a39f61..a6d706c2a49 100644
--- a/lib/gitlab/auth/current_user_mode.rb
+++ b/lib/gitlab/auth/current_user_mode.rb
@@ -77,7 +77,7 @@ module Gitlab
         return false unless user
 
         Gitlab::SafeRequestStore.fetch(admin_mode_rs_key) do
-          user.admin? && session_with_admin_mode?
+          user.admin? && (privileged_runtime? || session_with_admin_mode?)
         end
       end
 
@@ -154,6 +154,11 @@ module Gitlab
         Gitlab::SafeRequestStore.delete(admin_mode_rs_key)
         Gitlab::SafeRequestStore.delete(admin_mode_requested_rs_key)
       end
+
+      # Runtimes which imply shell access get admin mode automatically, see Gitlab::Runtime
+      def privileged_runtime?
+        Gitlab::Runtime.rake? || Gitlab::Runtime.rails_runner? || Gitlab::Runtime.console?
+      end
     end
   end
 end
diff --git a/lib/gitlab/auth/o_auth/provider.rb b/lib/gitlab/auth/o_auth/provider.rb
index 57ff3fcd1f0..ab6ac815601 100644
--- a/lib/gitlab/auth/o_auth/provider.rb
+++ b/lib/gitlab/auth/o_auth/provider.rb
@@ -5,11 +5,12 @@ module Gitlab
     module OAuth
       class Provider
         LABELS = {
-          "github"            => "GitHub",
-          "gitlab"            => "GitLab.com",
-          "google_oauth2"     => "Google",
-          "azure_oauth2"      => "Azure AD",
-          'atlassian_oauth2'  => 'Atlassian'
+          "github"                   => "GitHub",
+          "gitlab"                   => "GitLab.com",
+          "google_oauth2"            => "Google",
+          "azure_oauth2"             => "Azure AD",
+          "azure_activedirectory_v2" => "Azure AD v2",
+          'atlassian_oauth2'         => 'Atlassian'
         }.freeze
 
         def self.authentication(user, provider)
diff --git a/lib/gitlab/auth/o_auth/user.rb b/lib/gitlab/auth/o_auth/user.rb
index f556a7f40e9..fe1bf730e76 100644
--- a/lib/gitlab/auth/o_auth/user.rb
+++ b/lib/gitlab/auth/o_auth/user.rb
@@ -239,8 +239,9 @@ module Gitlab
         end
 
         def update_profile
-          clear_user_synced_attributes_metadata
+          return unless gl_user
 
+          clear_user_synced_attributes_metadata
           return unless sync_profile_from_provider? || creating_linked_ldap_user?
 
           metadata = gl_user.build_user_synced_attributes_metadata