Use a more obscure string for dropdown separators

The actual rendering of the dividers happens in gl_dropdown.js,
The rest of the files (other than the changelog) are updates to
use the new strings.

app/assets/javascripts/gl_dropdown.js

@@ -689,6 +689,10 @@ GitLabDropdown = (function() {
 
   GitLabDropdown.prototype.renderItem = function(data, group, index) {
     var field, html, selected, text, url, value, rowHidden;
+    var separators = new Map({
+      '--|GitLab|--divider-item--|GitLab|--': 'divider',
+      '--|GitLab|--separator-item--|GitLab|--': 'separator',
+    });
 
     if (!this.options.renderRow) {
       value = this.options.id ? this.options.id(data) : data.id;
@@ -715,8 +719,8 @@ GitLabDropdown = (function() {
       html.style.display = 'none';
     }
 
-    if (data === 'divider' || data === 'separator') {
-      html.className = data;
+    if (separators.has(data)) {
+      html.className = separators.get(data);
       return html;
     }
     // Header

app/assets/javascripts/groups/transfer_dropdown.js

@@ -14,7 +14,10 @@ export default class TransferDropdown {
   }
 
   buildDropdown() {
-    const extraOptions = [{ id: '', text: __('No parent group') }, 'divider'];
+    const extraOptions = [
+      { id: '', text: __('No parent group') },
+      '--|GitLab|--divider-item--|GitLab|--',
+    ];
 
     this.groupDropdown.glDropdown({
       selectable: true,

app/assets/javascripts/labels_select.js

@@ -231,7 +231,7 @@ export default class LabelsSelect {
                   });
                 }
                 if (extraData.length) {
-                  extraData.push('divider');
+                  extraData.push('--|GitLab|--divider-item--|GitLab|--');
                   data = extraData.concat(data);
                 }
               }

app/assets/javascripts/milestone_select.js

@@ -100,7 +100,7 @@ export default class MilestoneSelect {
               });
             }
             if (extraOptions.length) {
-              extraOptions.push('divider');
+              extraOptions.push('--|GitLab|--divider-item--|GitLab|--');
             }
 
             callback(extraOptions.concat(data));

app/assets/javascripts/namespace_select.js

@@ -34,7 +34,7 @@ export default class NamespaceSelect {
               id: null,
             };
             namespaces.unshift(anyNamespace);
-            namespaces.splice(1, 0, 'divider');
+            namespaces.splice(1, 0, '--|GitLab|--divider-item--|GitLab|--');
           }
           return dataCallback(namespaces);
         });

app/assets/javascripts/pages/search/show/search.js

@@ -30,7 +30,7 @@ export default class Search {
           data.unshift({
             full_name: __('Any'),
           });
-          data.splice(1, 0, 'divider');
+          data.splice(1, 0, '--|GitLab|--divider-item--|GitLab|--');
           return callback(data);
         });
       },
@@ -57,7 +57,7 @@ export default class Search {
             data.unshift({
               name_with_namespace: __('Any'),
             });
-            data.splice(1, 0, 'divider');
+            data.splice(1, 0, '--|GitLab|--divider-item--|GitLab|--');
 
             return data;
           })

app/assets/javascripts/search_autocomplete.js

@@ -191,7 +191,7 @@ export class SearchAutocomplete {
           // Add group header before list each group
           if (lastCategory !== suggestion.category) {
             if (!firstCategory) {
-              data.push('separator');
+              data.push('--|GitLab|--separator-item--|GitLab|--');
             }
             if (firstCategory) {
               firstCategory = false;
@@ -221,7 +221,7 @@ export class SearchAutocomplete {
             template = s__('SearchAutocomplete|in this group');
           }
 
-          data.unshift('separator');
+          data.unshift('--|GitLab|--separator-item--|GitLab|--');
           data.unshift({
             icon,
             text: term,

app/assets/javascripts/users_select.js

@@ -333,7 +333,7 @@ function UsersSelect(currentUser, els, options = {}) {
               }
 
               if (showDivider) {
-                users.splice(showDivider, 0, 'divider');
+                users.splice(showDivider, 0, '--|GitLab|--divider-item--|GitLab|--');
               }
 
               if ($dropdown.hasClass('js-multiselect')) {
@@ -358,7 +358,7 @@ function UsersSelect(currentUser, els, options = {}) {
                     users.splice(showDivider, 0, selectedUser);
                   });
 
-                  users.splice(showDivider + 1, 0, 'divider');
+                  users.splice(showDivider + 1, 0, '--|GitLab|--divider-item--|GitLab|--');
                 }
               }
             }

changelogs/unreleased/defect-ref-switcher-separators.yml

+---
+title: Fix ref switcher separators from conflicting branch names
+merge_request: 32198
+author:
+type: fixed