Fix conflicts on spec/features/protected_branches_spec.rb

app/assets/javascripts/protected_branches/protected_branch_create.js.es6

@@ -51,7 +51,7 @@
       });
 
       // Protected branch dropdown
-      new gl.ProtectedBranchDropdown({
+      new window.ProtectedBranchDropdown({
         $dropdown: this.$wrap.find('.js-protected-branch-select'),
         onSelect: this.onSelectCallback
       });

app/assets/javascripts/protected_branches/protected_branch_dropdown.js.es6

-/* eslint-disable */
-(global => {
-  global.gl = global.gl || {};
+/* eslint-disable comma-dangle, no-unused-vars */
 
-  class ProtectedBranchDropdown {
-    constructor(options) {
-      this.onSelect = options.onSelect;
-      this.$dropdown = options.$dropdown;
-      this.$dropdownContainer = this.$dropdown.parent();
-      this.$dropdownFooter = this.$dropdownContainer.find('.dropdown-footer');
-      this.$protectedBranch = this.$dropdownContainer.find('.create-new-protected-branch');
+class ProtectedBranchDropdown {
+  constructor(options) {
+    this.onSelect = options.onSelect;
+    this.$dropdown = options.$dropdown;
+    this.$dropdownContainer = this.$dropdown.parent();
+    this.$dropdownFooter = this.$dropdownContainer.find('.dropdown-footer');
+    this.$protectedBranch = this.$dropdownContainer.find('.create-new-protected-branch');
 
-      this.buildDropdown();
-      this.bindEvents();
+    this.buildDropdown();
+    this.bindEvents();
 
-      // Hide footer
-      this.$dropdownFooter.addClass('hidden');
-    }
+    // Hide footer
+    this.$dropdownFooter.addClass('hidden');
+  }
 
-    buildDropdown() {
-      this.$dropdown.glDropdown({
-        data: this.getProtectedBranches.bind(this),
-        filterable: true,
-        remote: false,
-        search: {
-          fields: ['title']
-        },
-        selectable: true,
-        toggleLabel(selected) {
-          return (selected && 'id' in selected) ? selected.title : 'Protected Branch';
-        },
-        fieldName: 'protected_branch[name]',
-        text(protectedBranch) {
-          return _.escape(protectedBranch.title);
-        },
-        id(protectedBranch) {
-          return _.escape(protectedBranch.id);
-        },
-        onFilter: this.toggleCreateNewButton.bind(this),
-        clicked: (item, $el, e) => {
-          e.preventDefault();
-          this.onSelect();
-        }
-      });
-    }
+  buildDropdown() {
+    this.$dropdown.glDropdown({
+      data: this.getProtectedBranches.bind(this),
+      filterable: true,
+      remote: false,
+      search: {
+        fields: ['title']
+      },
+      selectable: true,
+      toggleLabel(selected) {
+        return (selected && 'id' in selected) ? selected.title : 'Protected Branch';
+      },
+      fieldName: 'protected_branch[name]',
+      text(protectedBranch) {
+        return _.escape(protectedBranch.title);
+      },
+      id(protectedBranch) {
+        return _.escape(protectedBranch.id);
+      },
+      onFilter: this.toggleCreateNewButton.bind(this),
+      clicked: (item, $el, e) => {
+        e.preventDefault();
+        this.onSelect();
+      }
+    });
+  }
 
-    onClickCreateWildcard() {
-      // Refresh the dropdown's data, which ends up calling `getProtectedBranches`
-      this.$dropdown.data('glDropdown').remote.execute();
-      this.$dropdown.data('glDropdown').selectRowAtIndex(0);
-    }
+  onClickCreateWildcard() {
+    // Refresh the dropdown's data, which ends up calling `getProtectedBranches`
+    this.$dropdown.data('glDropdown').remote.execute();
+    this.$dropdown.data('glDropdown').selectRowAtIndex(0);
+  }
 
-    bindEvents() {
-      this.$protectedBranch.on('click', this.onClickCreateWildcard.bind(this));
-    }
+  bindEvents() {
+    this.$protectedBranch.on('click', this.onClickCreateWildcard.bind(this));
+  }
 
-    getProtectedBranches(term, callback) {
-      if (this.selectedBranch) {
-        callback(gon.open_branches.concat(this.selectedBranch));
-      } else {
-        callback(gon.open_branches);
-      }
+  getProtectedBranches(term, callback) {
+    if (this.selectedBranch) {
+      callback(gon.open_branches.concat(this.selectedBranch));
+    } else {
+      callback(gon.open_branches);
     }
+  }
 
-    toggleCreateNewButton(branchName) {
-      this.selectedBranch = {
-        title: branchName,
-        id: branchName,
-        text: branchName
-      };
+  toggleCreateNewButton(branchName) {
+    this.selectedBranch = {
+      title: branchName,
+      id: branchName,
+      text: branchName
+    };
 
-      if (branchName) {
-        this.$dropdownContainer
-          .find('.create-new-protected-branch code')
-          .text(branchName);
-      }
-
-      this.$dropdownFooter.toggleClass('hidden', !branchName);
+    if (branchName) {
+      this.$dropdownContainer
+        .find('.create-new-protected-branch code')
+        .text(branchName);
     }
-  }
-<<<<<<< HEAD
 
-  global.gl.ProtectedBranchDropdown = ProtectedBranchDropdown;
-})(window);
-=======
+    this.$dropdownFooter.toggleClass('hidden', !branchName);
+  }
 }
 
 window.ProtectedBranchDropdown = ProtectedBranchDropdown;
->>>>>>> 714f70a38df10e678bffde6e6081a97e31d8317c