Add latest changes from gitlab-org/gitlab@15-9-stable-ee

4 files changed, 24 insertions, 22 deletions

diff --git a/app/assets/javascripts/ref/components/ref_selector.vue b/app/assets/javascripts/ref/components/ref_selector.vue
index 359909b8f3b..9826124912b 100644
--- a/app/assets/javascripts/ref/components/ref_selector.vue
+++ b/app/assets/javascripts/ref/components/ref_selector.vue
@@ -119,6 +119,7 @@ export default {
           'gl-inset-border-1-red-500!': !this.state,
           'gl-font-monospace': Boolean(this.selectedRef),
         },
+        'gl-mb-0',
       ];
 
       if (Array.isArray(this.toggleButtonClass)) {
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb
index 01d28ed3221..1c5a601de25 100644
--- a/app/helpers/broadcast_messages_helper.rb
+++ b/app/helpers/broadcast_messages_helper.rb
@@ -62,6 +62,23 @@ module BroadcastMessagesHelper
     end.join(', ')
   end
 
+  def admin_broadcast_messages_data(broadcast_messages)
+    broadcast_messages.map do |message|
+      {
+        id: message.id,
+        status: broadcast_message_status(message),
+        preview: broadcast_message(message, preview: true),
+        starts_at: message.starts_at.iso8601,
+        ends_at: message.ends_at.iso8601,
+        target_roles: target_access_levels_display(message.target_access_levels),
+        target_path: message.target_path,
+        type: message.broadcast_type.capitalize,
+        edit_path: edit_admin_broadcast_message_path(message),
+        delete_path: "#{admin_broadcast_message_path(message)}.js"
+      }
+    end.to_json
+  end
+
   private
 
   def current_user_access_level_for_project_or_group
diff --git a/app/models/user_synced_attributes_metadata.rb b/app/models/user_synced_attributes_metadata.rb
index 4cceffda19e..4cd0e3fb828 100644
--- a/app/models/user_synced_attributes_metadata.rb
+++ b/app/models/user_synced_attributes_metadata.rb
@@ -27,15 +27,11 @@ class UserSyncedAttributesMetadata < ApplicationRecord
 
   class << self
     def syncable_attributes
-      return SYNCABLE_ATTRIBUTES if sync_name?
-
-      SYNCABLE_ATTRIBUTES - %i[name]
-    end
-
-    private
-
-    def sync_name?
-      Gitlab.config.ldap.sync_name
+      if Gitlab.config.ldap.enabled && !Gitlab.config.ldap.sync_name
+        SYNCABLE_ATTRIBUTES - %i[name]
+      else
+        SYNCABLE_ATTRIBUTES
+      end
     end
   end
 
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 2fb59570231..010cc493ddf 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -10,16 +10,4 @@
   page: params[:page] || 1,
   target_access_level_options: target_access_level_options.to_json,
   messages_count: @broadcast_messages.total_count,
-  messages: @broadcast_messages.map { |message| {
-    id: message.id,
-    status: broadcast_message_status(message),
-    preview: broadcast_message(message, preview: true),
-    starts_at: message.starts_at.to_s,
-    ends_at: message.ends_at.to_s,
-    target_roles: target_access_levels_display(message.target_access_levels),
-    target_path: message.target_path,
-    type: message.broadcast_type.capitalize,
-    edit_path: edit_admin_broadcast_message_path(message),
-    delete_path: admin_broadcast_message_path(message) + '.js'
-  } }.to_json
-} }
+  messages: admin_broadcast_messages_data(@broadcast_messages) } }