Merge branch 'master' into go-go-gadget-webpack

* master: (389 commits)
  Document "No gems fetched from git repositories" policy [ci skip]
  Typos
  Small gramatical tweaks
  Typos
  Added PHP & NPM doc
  Use `:empty_project` where possible in request specs
  Add caching of droplab ajax requests
  Use `:empty_project` where possible in model specs
  Revert 3f17f29a
  Remove unused js response from refs controller
  Add MR id to changelog entry
  fixed small mini pipeline graph line glitch
  Prevent form to be submitted twice
  Fix Error 500 when repositories contain annotated tags pointing to blobs
  Fix /explore sorting (trending)
  Simplify wording in "adding an image" docs
  Remove "official merge window" from CONTRIBUTING.md [ci skip]
  Update repository check documentation
  Fixed flexbox and wrap issues
  Update two_factor_authentication.md
  ...

7 files changed, 88 insertions, 99 deletions

diff --git a/app/assets/javascripts/blob/blob_ci_yaml.js.es6 b/app/assets/javascripts/blob/blob_ci_yaml.js.es6
index a548509ee0d..ec1c018424d 100644
--- a/app/assets/javascripts/blob/blob_ci_yaml.js.es6
+++ b/app/assets/javascripts/blob/blob_ci_yaml.js.es6
@@ -1,10 +1,9 @@
-/* eslint-disable padded-blocks, no-param-reassign, comma-dangle */
+/* eslint-disable no-param-reassign, comma-dangle */
 /* global Api */
 
 require('./template_selector');
 
 ((global) => {
-
   class BlobCiYamlSelector extends gl.TemplateSelector {
     requestFile(query) {
       return Api.gitlabCiYml(query.name, this.requestFileSuccess.bind(this));
@@ -40,5 +39,4 @@ require('./template_selector');
   }
 
   global.BlobCiYamlSelectors = BlobCiYamlSelectors;
-
 })(window.gl || (window.gl = {}));
diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js b/app/assets/javascripts/blob/blob_file_dropzone.js
index eab686c45c3..04bfe363929 100644
--- a/app/assets/javascripts/blob/blob_file_dropzone.js
+++ b/app/assets/javascripts/blob/blob_file_dropzone.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, one-var, no-var, one-var-declaration-per-line, camelcase, object-shorthand, quotes, comma-dangle, prefer-arrow-callback, no-unused-vars, prefer-template, no-useless-escape, no-alert, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, one-var, no-var, one-var-declaration-per-line, camelcase, object-shorthand, quotes, comma-dangle, prefer-arrow-callback, no-unused-vars, prefer-template, no-useless-escape, no-alert, max-len */
 /* global Dropzone */
 
 (function() {
@@ -62,7 +62,5 @@
     }
 
     return BlobFileDropzone;
-
   })();
-
 }).call(this);
diff --git a/app/assets/javascripts/blob/blob_gitignore_selector.js b/app/assets/javascripts/blob/blob_gitignore_selector.js
index 82a198ad825..1d0bcf6471f 100644
--- a/app/assets/javascripts/blob/blob_gitignore_selector.js
+++ b/app/assets/javascripts/blob/blob_gitignore_selector.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, max-len, one-var, no-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, prefer-rest-params, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, max-len, one-var, no-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, prefer-rest-params */
 /* global Api */
 
 require('./template_selector');
@@ -19,7 +19,5 @@ require('./template_selector');
     };
 
     return BlobGitignoreSelector;
-
   })(gl.TemplateSelector);
-
 }).call(this);
diff --git a/app/assets/javascripts/blob/blob_gitignore_selectors.js b/app/assets/javascripts/blob/blob_gitignore_selectors.js
index d7f95093688..8236457f0f1 100644
--- a/app/assets/javascripts/blob/blob_gitignore_selectors.js
+++ b/app/assets/javascripts/blob/blob_gitignore_selectors.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-unused-expressions, no-cond-assign, no-sequences, comma-dangle, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-unused-expressions, no-cond-assign, no-sequences, comma-dangle, max-len */
 /* global BlobGitignoreSelector */
 
 (function() {
@@ -22,7 +22,5 @@
     }
 
     return BlobGitignoreSelectors;
-
   })();
-
 }).call(this);
diff --git a/app/assets/javascripts/blob/blob_license_selector.js b/app/assets/javascripts/blob/blob_license_selector.js
index 4c3ca20e25d..1d5672d4c48 100644
--- a/app/assets/javascripts/blob/blob_license_selector.js
+++ b/app/assets/javascripts/blob/blob_license_selector.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, max-len, one-var, no-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, prefer-rest-params, comma-dangle, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, max-len, one-var, no-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, prefer-rest-params, comma-dangle */
 /* global Api */
 
 require('./template_selector');
@@ -24,7 +24,5 @@ require('./template_selector');
     };
 
     return BlobLicenseSelector;
-
   })(gl.TemplateSelector);
-
 }).call(this);
diff --git a/app/assets/javascripts/blob/blob_license_selectors.js.es6 b/app/assets/javascripts/blob/blob_license_selectors.js.es6
index 268640681d4..c5067b0feae 100644
--- a/app/assets/javascripts/blob/blob_license_selectors.js.es6
+++ b/app/assets/javascripts/blob/blob_license_selectors.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-vars, no-param-reassign, padded-blocks */
+/* eslint-disable no-unused-vars, no-param-reassign */
 /* global BlobLicenseSelector */
 
 ((global) => {
@@ -20,5 +20,4 @@
   }
 
   global.BlobLicenseSelectors = BlobLicenseSelectors;
-
 })(window.gl || (window.gl = {}));
diff --git a/app/assets/javascripts/blob/template_selector.js.es6 b/app/assets/javascripts/blob/template_selector.js.es6
index 7a1ee9998c8..7e03ec3b391 100644
--- a/app/assets/javascripts/blob/template_selector.js.es6
+++ b/app/assets/javascripts/blob/template_selector.js.es6
@@ -1,101 +1,101 @@
-/* eslint-disable indent, comma-dangle, object-shorthand, func-names, space-before-function-paren, arrow-parens, no-unused-vars, class-methods-use-this, no-var, consistent-return, prefer-const, no-param-reassign, space-in-parens, max-len */
+/* eslint-disable comma-dangle, object-shorthand, func-names, space-before-function-paren, arrow-parens, no-unused-vars, class-methods-use-this, no-var, consistent-return, no-param-reassign, max-len */
 
 ((global) => {
-    class TemplateSelector {
-      constructor({ dropdown, data, pattern, wrapper, editor, fileEndpoint, $input } = {}) {
-        this.onClick = this.onClick.bind(this);
-        this.dropdown = dropdown;
-        this.data = data;
-        this.pattern = pattern;
-        this.wrapper = wrapper;
-        this.editor = editor;
-        this.fileEndpoint = fileEndpoint;
-        this.$input = $input || $('#file_name');
-        this.dropdownIcon = $('.fa-chevron-down', this.dropdown);
-        this.buildDropdown();
-        this.bindEvents();
-        this.onFilenameUpdate();
+  class TemplateSelector {
+    constructor({ dropdown, data, pattern, wrapper, editor, fileEndpoint, $input } = {}) {
+      this.onClick = this.onClick.bind(this);
+      this.dropdown = dropdown;
+      this.data = data;
+      this.pattern = pattern;
+      this.wrapper = wrapper;
+      this.editor = editor;
+      this.fileEndpoint = fileEndpoint;
+      this.$input = $input || $('#file_name');
+      this.dropdownIcon = $('.fa-chevron-down', this.dropdown);
+      this.buildDropdown();
+      this.bindEvents();
+      this.onFilenameUpdate();
 
-        this.autosizeUpdateEvent = document.createEvent('Event');
-        this.autosizeUpdateEvent.initEvent('autosize:update', true, false);
-      }
+      this.autosizeUpdateEvent = document.createEvent('Event');
+      this.autosizeUpdateEvent.initEvent('autosize:update', true, false);
+    }
 
-      buildDropdown() {
-        return this.dropdown.glDropdown({
-          data: this.data,
-          filterable: true,
-          selectable: true,
-          toggleLabel: this.toggleLabel,
-          search: {
-            fields: ['name']
-          },
-          clicked: this.onClick,
-          text: function(item) {
-            return item.name;
-          }
-        });
-      }
+    buildDropdown() {
+      return this.dropdown.glDropdown({
+        data: this.data,
+        filterable: true,
+        selectable: true,
+        toggleLabel: this.toggleLabel,
+        search: {
+          fields: ['name']
+        },
+        clicked: this.onClick,
+        text: function(item) {
+          return item.name;
+        }
+      });
+    }
 
-      bindEvents() {
-        return this.$input.on('keyup blur', (e) => this.onFilenameUpdate());
-      }
+    bindEvents() {
+      return this.$input.on('keyup blur', (e) => this.onFilenameUpdate());
+    }
 
-      toggleLabel(item) {
-        return item.name;
-      }
+    toggleLabel(item) {
+      return item.name;
+    }
 
-      onFilenameUpdate() {
-        var filenameMatches;
-        if (!this.$input.length) {
-          return;
-        }
-        filenameMatches = this.pattern.test(this.$input.val().trim());
-        if (!filenameMatches) {
-          this.wrapper.addClass('hidden');
-          return;
-        }
-        return this.wrapper.removeClass('hidden');
+    onFilenameUpdate() {
+      var filenameMatches;
+      if (!this.$input.length) {
+        return;
       }
-
-      onClick(item, el, e) {
-        e.preventDefault();
-        return this.requestFile(item);
+      filenameMatches = this.pattern.test(this.$input.val().trim());
+      if (!filenameMatches) {
+        this.wrapper.addClass('hidden');
+        return;
       }
+      return this.wrapper.removeClass('hidden');
+    }
 
-      requestFile(item) {
-        // This `requestFile` method is an abstract method that should
-        // be added by all subclasses.
-      }
+    onClick(item, el, e) {
+      e.preventDefault();
+      return this.requestFile(item);
+    }
 
-      // To be implemented on the extending class
-      // e.g.
-      // Api.gitignoreText item.name, @requestFileSuccess.bind(@)
-      requestFileSuccess(file, { skipFocus } = {}) {
-        if (!file) return;
+    requestFile(item) {
+      // This `requestFile` method is an abstract method that should
+      // be added by all subclasses.
+    }
 
-        const oldValue = this.editor.getValue();
-        let newValue = file.content;
+    // To be implemented on the extending class
+    // e.g.
+    // Api.gitignoreText item.name, @requestFileSuccess.bind(@)
+    requestFileSuccess(file, { skipFocus } = {}) {
+      if (!file) return;
 
-        this.editor.setValue(newValue, 1);
-        if (!skipFocus) this.editor.focus();
+      const oldValue = this.editor.getValue();
+      const newValue = file.content;
 
-        if (this.editor instanceof jQuery) {
-          this.editor.get(0).dispatchEvent(this.autosizeUpdateEvent);
-        }
-      }
+      this.editor.setValue(newValue, 1);
+      if (!skipFocus) this.editor.focus();
 
-      startLoadingSpinner() {
-        this.dropdownIcon
-          .addClass('fa-spinner fa-spin')
-          .removeClass('fa-chevron-down');
+      if (this.editor instanceof jQuery) {
+        this.editor.get(0).dispatchEvent(this.autosizeUpdateEvent);
       }
+    }
 
-      stopLoadingSpinner() {
-        this.dropdownIcon
-          .addClass('fa-chevron-down')
-          .removeClass('fa-spinner fa-spin');
-      }
+    startLoadingSpinner() {
+      this.dropdownIcon
+        .addClass('fa-spinner fa-spin')
+        .removeClass('fa-chevron-down');
+    }
+
+    stopLoadingSpinner() {
+      this.dropdownIcon
+        .addClass('fa-chevron-down')
+        .removeClass('fa-spinner fa-spin');
     }
+  }
 
-    global.TemplateSelector = TemplateSelector;
-  })(window.gl || ( window.gl = {}));
+  global.TemplateSelector = TemplateSelector;
+})(window.gl || (window.gl = {}));