Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-filefix-git-hooks-when-creating-file

* upstream/master: (190 commits)
  Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion.
  update spec
  Change the reply shortcut to focus the field even without a selection.
  use destroy_all
  Remove settings cog from within admin scroll tabs; keep links centered
  add changelog
  remove old project members from project
  add spec replicating validation error
  Fix small typo on new branch button spec
  Improve styling of the new issue message
  Don't capitalize environment name in show page
  Abillity to promote project labels to group labels
  Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles
  Update and pin the `jwt` gem to ~> 1.5.6
  refactor merge request build service
  Update index.md
  Clarify that Auto Deploy requires a public project.
  19164 Add settings dropdown to mobile screens
  cop for gem fetched from a git source
  Add CHANGELOG entry
  ...

7 files changed, 469 insertions, 22 deletions

diff --git a/spec/javascripts/commits_spec.js.es6 b/spec/javascripts/commits_spec.js.es6
new file mode 100644
index 00000000000..bb9a9072f3a
--- /dev/null
+++ b/spec/javascripts/commits_spec.js.es6
@@ -0,0 +1,50 @@
+/* global CommitsList */
+
+//= require jquery.endless-scroll
+//= require pager
+//= require commits
+
+(() => {
+  describe('Commits List', () => {
+    beforeEach(() => {
+      setFixtures(`
+        <form class="commits-search-form" action="/h5bp/html5-boilerplate/commits/master">
+          <input id="commits-search">
+        </form>
+        <ol id="commits-list"></ol>
+        `);
+    });
+
+    it('should be defined', () => {
+      expect(CommitsList).toBeDefined();
+    });
+
+    describe('on entering input', () => {
+      let ajaxSpy;
+
+      beforeEach(() => {
+        CommitsList.init(25);
+        CommitsList.searchField.val('');
+        spyOn(history, 'replaceState').and.stub();
+        ajaxSpy = spyOn(jQuery, 'ajax').and.callFake((req) => {
+          req.success({
+            data: '<li>Result</li>',
+          });
+        });
+      });
+
+      it('should save the last search string', () => {
+        CommitsList.searchField.val('GitLab');
+        CommitsList.filterResults();
+        expect(ajaxSpy).toHaveBeenCalled();
+        expect(CommitsList.lastSearch).toEqual('GitLab');
+      });
+
+      it('should not make ajax call if the input does not change', () => {
+        CommitsList.filterResults();
+        expect(ajaxSpy).not.toHaveBeenCalled();
+        expect(CommitsList.lastSearch).toEqual('');
+      });
+    });
+  });
+})();
diff --git a/spec/javascripts/filtered_search/dropdown_user_spec.js.es6 b/spec/javascripts/filtered_search/dropdown_user_spec.js.es6
new file mode 100644
index 00000000000..5eba4343a1d
--- /dev/null
+++ b/spec/javascripts/filtered_search/dropdown_user_spec.js.es6
@@ -0,0 +1,40 @@
+//= require filtered_search/dropdown_utils
+//= require filtered_search/filtered_search_tokenizer
+//= require filtered_search/filtered_search_dropdown
+//= require filtered_search/dropdown_user
+
+(() => {
+  describe('Dropdown User', () => {
+    describe('getSearchInput', () => {
+      let dropdownUser;
+
+      beforeEach(() => {
+        spyOn(gl.FilteredSearchDropdown.prototype, 'constructor').and.callFake(() => {});
+        spyOn(gl.DropdownUser.prototype, 'getProjectId').and.callFake(() => {});
+        spyOn(gl.DropdownUtils, 'getSearchInput').and.callFake(() => {});
+
+        dropdownUser = new gl.DropdownUser();
+      });
+
+      it('should not return the double quote found in value', () => {
+        spyOn(gl.FilteredSearchTokenizer, 'processTokens').and.returnValue({
+          lastToken: {
+            value: '"johnny appleseed',
+          },
+        });
+
+        expect(dropdownUser.getSearchInput()).toBe('johnny appleseed');
+      });
+
+      it('should not return the single quote found in value', () => {
+        spyOn(gl.FilteredSearchTokenizer, 'processTokens').and.returnValue({
+          lastToken: {
+            value: '\'larry boy',
+          },
+        });
+
+        expect(dropdownUser.getSearchInput()).toBe('larry boy');
+      });
+    });
+  });
+})();
diff --git a/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6 b/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
index 19bd8d53219..89e49b7c511 100644
--- a/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
+++ b/spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
@@ -64,6 +64,68 @@
         const updatedItem = gl.DropdownUtils.filterWithSymbol('@', input, item);
         expect(updatedItem.droplab_hidden).toBe(false);
       });
+
+      describe('filters multiple word title', () => {
+        const multipleWordItem = {
+          title: 'Community Contributions',
+        };
+
+        it('should filter with double quote', () => {
+          input.value = 'label:"';
+
+          const updatedItem = gl.DropdownUtils.filterWithSymbol('~', input, multipleWordItem);
+          expect(updatedItem.droplab_hidden).toBe(false);
+        });
+
+        it('should filter with double quote and symbol', () => {
+          input.value = 'label:~"';
+
+          const updatedItem = gl.DropdownUtils.filterWithSymbol('~', input, multipleWordItem);
+          expect(updatedItem.droplab_hidden).toBe(false);
+        });
+
+        it('should filter with double quote and multiple words', () => {
+          input.value = 'label:"community con';
+
+          const updatedItem = gl.DropdownUtils.filterWithSymbol('~', input, multipleWordItem);
+          expect(updatedItem.droplab_hidden).toBe(false);
+        });
+
+        it('should filter with double quote, symbol and multiple words', () => {
+          input.value = 'label:~"community con';
+
+          const updatedItem = gl.DropdownUtils.filterWithSymbol('~', input, multipleWordItem);
+          expect(updatedItem.droplab_hidden).toBe(false);
+        });
+
+        it('should filter with single quote', () => {
+          input.value = 'label:\'';
+
+          const updatedItem = gl.DropdownUtils.filterWithSymbol('~', input, multipleWordItem);
+          expect(updatedItem.droplab_hidden).toBe(false);
+        });
+
+        it('should filter with single quote and symbol', () => {
+          input.value = 'label:~\'';
+
+          const updatedItem = gl.DropdownUtils.filterWithSymbol('~', input, multipleWordItem);
+          expect(updatedItem.droplab_hidden).toBe(false);
+        });
+
+        it('should filter with single quote and multiple words', () => {
+          input.value = 'label:\'community con';
+
+          const updatedItem = gl.DropdownUtils.filterWithSymbol('~', input, multipleWordItem);
+          expect(updatedItem.droplab_hidden).toBe(false);
+        });
+
+        it('should filter with single quote, symbol and multiple words', () => {
+          input.value = 'label:~\'community con';
+
+          const updatedItem = gl.DropdownUtils.filterWithSymbol('~', input, multipleWordItem);
+          expect(updatedItem.droplab_hidden).toBe(false);
+        });
+      });
     });
 
     describe('filterHint', () => {
@@ -130,5 +192,99 @@
         expect(result).toBe(false);
       });
     });
+
+    describe('getInputSelectionPosition', () => {
+      describe('word with trailing spaces', () => {
+        const value = 'label:none ';
+
+        it('should return selectionStart when cursor is at the trailing space', () => {
+          const { left, right } = gl.DropdownUtils.getInputSelectionPosition({
+            selectionStart: 11,
+            value,
+          });
+
+          expect(left).toBe(11);
+          expect(right).toBe(11);
+        });
+
+        it('should return input when cursor is at the start of input', () => {
+          const { left, right } = gl.DropdownUtils.getInputSelectionPosition({
+            selectionStart: 0,
+            value,
+          });
+
+          expect(left).toBe(0);
+          expect(right).toBe(10);
+        });
+
+        it('should return input when cursor is at the middle of input', () => {
+          const { left, right } = gl.DropdownUtils.getInputSelectionPosition({
+            selectionStart: 7,
+            value,
+          });
+
+          expect(left).toBe(0);
+          expect(right).toBe(10);
+        });
+
+        it('should return input when cursor is at the end of input', () => {
+          const { left, right } = gl.DropdownUtils.getInputSelectionPosition({
+            selectionStart: 10,
+            value,
+          });
+
+          expect(left).toBe(0);
+          expect(right).toBe(10);
+        });
+      });
+
+      describe('multiple words', () => {
+        const value = 'label:~"Community Contribution"';
+
+        it('should return input when cursor is after the first word', () => {
+          const { left, right } = gl.DropdownUtils.getInputSelectionPosition({
+            selectionStart: 17,
+            value,
+          });
+
+          expect(left).toBe(0);
+          expect(right).toBe(31);
+        });
+
+        it('should return input when cursor is before the second word', () => {
+          const { left, right } = gl.DropdownUtils.getInputSelectionPosition({
+            selectionStart: 18,
+            value,
+          });
+
+          expect(left).toBe(0);
+          expect(right).toBe(31);
+        });
+      });
+
+      describe('incomplete multiple words', () => {
+        const value = 'label:~"Community Contribution';
+
+        it('should return entire input when cursor is at the start of input', () => {
+          const { left, right } = gl.DropdownUtils.getInputSelectionPosition({
+            selectionStart: 0,
+            value,
+          });
+
+          expect(left).toBe(0);
+          expect(right).toBe(30);
+        });
+
+        it('should return entire input when cursor is at the end of input', () => {
+          const { left, right } = gl.DropdownUtils.getInputSelectionPosition({
+            selectionStart: 30,
+            value,
+          });
+
+          expect(left).toBe(0);
+          expect(right).toBe(30);
+        });
+      });
+    });
   });
 })();
diff --git a/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
new file mode 100644
index 00000000000..c8b5c2b36ad
--- /dev/null
+++ b/spec/javascripts/filtered_search/filtered_search_manager_spec.js.es6
@@ -0,0 +1,68 @@
+/* global Turbolinks */
+
+//= require turbolinks
+//= require lib/utils/common_utils
+//= require filtered_search/filtered_search_token_keys
+//= require filtered_search/filtered_search_tokenizer
+//= require filtered_search/filtered_search_dropdown_manager
+//= require filtered_search/filtered_search_manager
+
+(() => {
+  describe('Filtered Search Manager', () => {
+    describe('search', () => {
+      let manager;
+      const defaultParams = '?scope=all&utf8=✓&state=opened';
+
+      function getInput() {
+        return document.querySelector('.filtered-search');
+      }
+
+      beforeEach(() => {
+        setFixtures(`
+          <input type='text' class='filtered-search' />
+        `);
+
+        spyOn(gl.FilteredSearchManager.prototype, 'bindEvents').and.callFake(() => {});
+        spyOn(gl.FilteredSearchManager.prototype, 'loadSearchParamsFromURL').and.callFake(() => {});
+        spyOn(gl.FilteredSearchDropdownManager.prototype, 'setDropdown').and.callFake(() => {});
+        spyOn(gl.utils, 'getParameterByName').and.returnValue(null);
+
+        manager = new gl.FilteredSearchManager();
+      });
+
+      afterEach(() => {
+        getInput().outerHTML = '';
+      });
+
+      it('should search with a single word', () => {
+        getInput().value = 'searchTerm';
+
+        spyOn(Turbolinks, 'visit').and.callFake((url) => {
+          expect(url).toEqual(`${defaultParams}&search=searchTerm`);
+        });
+
+        manager.search();
+      });
+
+      it('should search with multiple words', () => {
+        getInput().value = 'awesome search terms';
+
+        spyOn(Turbolinks, 'visit').and.callFake((url) => {
+          expect(url).toEqual(`${defaultParams}&search=awesome+search+terms`);
+        });
+
+        manager.search();
+      });
+
+      it('should search with special characters', () => {
+        getInput().value = '~!@#$%^&*()_+{}:<>,.?/';
+
+        spyOn(Turbolinks, 'visit').and.callFake((url) => {
+          expect(url).toEqual(`${defaultParams}&search=~!%40%23%24%25%5E%26*()_%2B%7B%7D%3A%3C%3E%2C.%3F%2F`);
+        });
+
+        manager.search();
+      });
+    });
+  });
+})();
diff --git a/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6 b/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
index 6df7c0e44ef..9d9097419ea 100644
--- a/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
+++ b/spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
@@ -72,6 +72,12 @@
         const result = gl.FilteredSearchTokenKeys.searchByKeyParam(`${tokenKeys[0].key}_${tokenKeys[0].param}`);
         expect(result).toEqual(tokenKeys[0]);
       });
+
+      it('should return alternative tokenKey when found by key param', () => {
+        const tokenKeys = gl.FilteredSearchTokenKeys.getAlternatives();
+        const result = gl.FilteredSearchTokenKeys.searchByKeyParam(`${tokenKeys[0].key}_${tokenKeys[0].param}`);
+        expect(result).toEqual(tokenKeys[0]);
+      });
     });
 
     describe('searchByConditionUrl', () => {
diff --git a/spec/javascripts/gl_form_spec.js.es6 b/spec/javascripts/gl_form_spec.js.es6
new file mode 100644
index 00000000000..b5f99483bfb
--- /dev/null
+++ b/spec/javascripts/gl_form_spec.js.es6
@@ -0,0 +1,122 @@
+/* global autosize */
+/*= require gl_form */
+/*= require autosize */
+/*= require lib/utils/text_utility */
+/*= require lib/utils/common_utils */
+
+describe('GLForm', () => {
+  const global = window.gl || (window.gl = {});
+  const GLForm = global.GLForm;
+
+  it('should be defined in the global scope', () => {
+    expect(GLForm).toBeDefined();
+  });
+
+  describe('when instantiated', function () {
+    beforeEach((done) => {
+      this.form = $('<form class="gfm-form"><textarea class="js-gfm-input"></form>');
+      this.textarea = this.form.find('textarea');
+      spyOn($.prototype, 'off').and.returnValue(this.textarea);
+      spyOn($.prototype, 'on').and.returnValue(this.textarea);
+      spyOn($.prototype, 'css');
+      spyOn(window, 'autosize');
+
+      this.glForm = new GLForm(this.form);
+      setTimeout(() => {
+        $.prototype.off.calls.reset();
+        $.prototype.on.calls.reset();
+        $.prototype.css.calls.reset();
+        autosize.calls.reset();
+        done();
+      });
+    });
+
+    describe('.setupAutosize', () => {
+      beforeEach((done) => {
+        this.glForm.setupAutosize();
+        setTimeout(() => {
+          done();
+        });
+      });
+
+      it('should register an autosize event handler on the textarea', () => {
+        expect($.prototype.off).toHaveBeenCalledWith('autosize:resized');
+        expect($.prototype.on).toHaveBeenCalledWith('autosize:resized', jasmine.any(Function));
+      });
+
+      it('should register a mouseup event handler on the textarea', () => {
+        expect($.prototype.off).toHaveBeenCalledWith('mouseup.autosize');
+        expect($.prototype.on).toHaveBeenCalledWith('mouseup.autosize', jasmine.any(Function));
+      });
+
+      it('should autosize the textarea', () => {
+        expect(autosize).toHaveBeenCalledWith(jasmine.any(Object));
+      });
+
+      it('should set the resize css property to vertical', () => {
+        expect($.prototype.css).toHaveBeenCalledWith('resize', 'vertical');
+      });
+    });
+
+    describe('.setHeightData', () => {
+      beforeEach(() => {
+        spyOn($.prototype, 'data');
+        spyOn($.prototype, 'outerHeight').and.returnValue(200);
+        this.glForm.setHeightData();
+      });
+
+      it('should set the height data attribute', () => {
+        expect($.prototype.data).toHaveBeenCalledWith('height', 200);
+      });
+
+      it('should call outerHeight', () => {
+        expect($.prototype.outerHeight).toHaveBeenCalled();
+      });
+    });
+
+    describe('.destroyAutosize', () => {
+      describe('when called', () => {
+        beforeEach(() => {
+          spyOn($.prototype, 'data');
+          spyOn($.prototype, 'outerHeight').and.returnValue(200);
+          spyOn(window, 'outerHeight').and.returnValue(400);
+          spyOn(autosize, 'destroy');
+
+          this.glForm.destroyAutosize();
+        });
+
+        it('should call outerHeight', () => {
+          expect($.prototype.outerHeight).toHaveBeenCalled();
+        });
+
+        it('should get data-height attribute', () => {
+          expect($.prototype.data).toHaveBeenCalledWith('height');
+        });
+
+        it('should call autosize destroy', () => {
+          expect(autosize.destroy).toHaveBeenCalledWith(this.textarea);
+        });
+
+        it('should set the data-height attribute', () => {
+          expect($.prototype.data).toHaveBeenCalledWith('height', 200);
+        });
+
+        it('should set the outerHeight', () => {
+          expect($.prototype.outerHeight).toHaveBeenCalledWith(200);
+        });
+
+        it('should set the css', () => {
+          expect($.prototype.css).toHaveBeenCalledWith('max-height', window.outerHeight);
+        });
+      });
+
+      it('should return undefined if the data-height equals the outerHeight', () => {
+        spyOn($.prototype, 'outerHeight').and.returnValue(200);
+        spyOn($.prototype, 'data').and.returnValue(200);
+        spyOn(autosize, 'destroy');
+        expect(this.glForm.destroyAutosize()).toBeUndefined();
+        expect(autosize.destroy).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/shortcuts_issuable_spec.js b/spec/javascripts/shortcuts_issuable_spec.js
index 386fc8f514e..db11c2516a6 100644
--- a/spec/javascripts/shortcuts_issuable_spec.js
+++ b/spec/javascripts/shortcuts_issuable_spec.js
@@ -11,9 +11,9 @@
     beforeEach(function() {
       loadFixtures(fixtureName);
       document.querySelector('.js-new-note-form').classList.add('js-main-target-form');
-      return this.shortcut = new ShortcutsIssuable();
+      this.shortcut = new ShortcutsIssuable();
     });
-    return describe('#replyWithSelectedText', function() {
+    describe('#replyWithSelectedText', function() {
       var stubSelection;
       // Stub window.gl.utils.getSelectedFragment to return a node with the provided HTML.
       stubSelection = function(html) {
@@ -24,56 +24,61 @@
         };
       };
       beforeEach(function() {
-        return this.selector = 'form.js-main-target-form textarea#note_note';
+        this.selector = 'form.js-main-target-form textarea#note_note';
       });
       describe('with empty selection', function() {
-        return it('does nothing', function() {
-          stubSelection('');
+        it('does not return an error', function() {
           this.shortcut.replyWithSelectedText();
-          return expect($(this.selector).val()).toBe('');
+          expect($(this.selector).val()).toBe('');
+        });
+        it('triggers `input`', function() {
+          var focused = false;
+          $(this.selector).on('focus', function() {
+            focused = true;
+          });
+          this.shortcut.replyWithSelectedText();
+          expect(focused).toBe(true);
         });
       });
       describe('with any selection', function() {
         beforeEach(function() {
-          return stubSelection('<p>Selected text.</p>');
+          stubSelection('<p>Selected text.</p>');
         });
         it('leaves existing input intact', function() {
           $(this.selector).val('This text was already here.');
           expect($(this.selector).val()).toBe('This text was already here.');
           this.shortcut.replyWithSelectedText();
-          return expect($(this.selector).val()).toBe("This text was already here.\n\n> Selected text.\n\n");
+          expect($(this.selector).val()).toBe("This text was already here.\n\n> Selected text.\n\n");
         });
         it('triggers `input`', function() {
-          var triggered;
-          triggered = false;
+          var triggered = false;
           $(this.selector).on('input', function() {
-            return triggered = true;
+            triggered = true;
           });
           this.shortcut.replyWithSelectedText();
-          return expect(triggered).toBe(true);
+          expect(triggered).toBe(true);
         });
-        return it('triggers `focus`', function() {
-          var focused;
-          focused = false;
+        it('triggers `focus`', function() {
+          var focused = false;
           $(this.selector).on('focus', function() {
-            return focused = true;
+            focused = true;
           });
           this.shortcut.replyWithSelectedText();
-          return expect(focused).toBe(true);
+          expect(focused).toBe(true);
         });
       });
       describe('with a one-line selection', function() {
-        return it('quotes the selection', function() {
+        it('quotes the selection', function() {
           stubSelection('<p>This text has been selected.</p>');
           this.shortcut.replyWithSelectedText();
-          return expect($(this.selector).val()).toBe("> This text has been selected.\n\n");
+          expect($(this.selector).val()).toBe("> This text has been selected.\n\n");
         });
       });
-      return describe('with a multi-line selection', function() {
-        return it('quotes the selected lines as a group', function() {
+      describe('with a multi-line selection', function() {
+        it('quotes the selected lines as a group', function() {
           stubSelection("<p>Selected line one.</p>\n\n<p>Selected line two.</p>\n\n<p>Selected line three.</p>");
           this.shortcut.replyWithSelectedText();
-          return expect($(this.selector).val()).toBe("> Selected line one.\n>\n> Selected line two.\n>\n> Selected line three.\n\n");
+          expect($(this.selector).val()).toBe("> Selected line one.\n>\n> Selected line two.\n>\n> Selected line three.\n\n");
         });
       });
     });