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
  ...

12 files changed, 167 insertions, 168 deletions

diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6
index 9f454486efc..8c7f59652ca 100644
--- a/app/assets/javascripts/boards/boards_bundle.js.es6
+++ b/app/assets/javascripts/boards/boards_bundle.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable one-var, indent, quote-props, comma-dangle, space-before-function-paren, import/newline-after-import, no-multi-spaces, max-len */
+/* eslint-disable one-var, quote-props, comma-dangle, space-before-function-paren, import/newline-after-import, no-multi-spaces, max-len */
 /* global Vue */
 /* global BoardService */
 
@@ -18,8 +18,8 @@ require('./components/new_list_dropdown');
 require('./vue_resource_interceptor');
 
 $(() => {
-  const $boardApp = document.getElementById('board-app'),
-        Store = gl.issueBoards.BoardsStore;
+  const $boardApp = document.getElementById('board-app');
+  const Store = gl.issueBoards.BoardsStore;
 
   window.gl = window.gl || {};
 
diff --git a/app/assets/javascripts/boards/components/board.js.es6 b/app/assets/javascripts/boards/components/board.js.es6
index b3ca4aa90a7..d0dbbb17d3e 100644
--- a/app/assets/javascripts/boards/components/board.js.es6
+++ b/app/assets/javascripts/boards/components/board.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, space-before-function-paren, one-var, indent, radix */
+/* eslint-disable comma-dangle, space-before-function-paren, one-var */
 /* global Vue */
 /* global Sortable */
 
@@ -88,8 +88,8 @@ require('./board_list');
           gl.issueBoards.onEnd();
 
           if (e.newIndex !== undefined && e.oldIndex !== e.newIndex) {
-            const order = this.sortable.toArray(),
-                  list = Store.findList('id', parseInt(e.item.dataset.id));
+            const order = this.sortable.toArray();
+            const list = Store.findList('id', parseInt(e.item.dataset.id, 10));
 
             this.$nextTick(() => {
               Store.moveList(list, order);
diff --git a/app/assets/javascripts/boards/components/board_blank_state.js.es6 b/app/assets/javascripts/boards/components/board_blank_state.js.es6
index 0a47a22fad2..d76314c1892 100644
--- a/app/assets/javascripts/boards/components/board_blank_state.js.es6
+++ b/app/assets/javascripts/boards/components/board_blank_state.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable space-before-function-paren, comma-dangle, semi */
+/* eslint-disable space-before-function-paren, comma-dangle */
 /* global Vue */
 /* global ListLabel */
 
@@ -15,7 +15,7 @@
           new ListLabel({ title: 'To Do', color: '#F0AD4E' }),
           new ListLabel({ title: 'Doing', color: '#5CB85C' })
         ]
-      }
+      };
     },
     methods: {
       addDefaultLists () {
diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6
index d896076d4af..57059cef444 100644
--- a/app/assets/javascripts/boards/components/board_list.js.es6
+++ b/app/assets/javascripts/boards/components/board_list.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, space-before-function-paren, max-len, no-plusplus */
+/* eslint-disable comma-dangle, space-before-function-paren, max-len */
 /* global Vue */
 /* global Sortable */
 
@@ -43,7 +43,7 @@ require('./board_new_issue');
       issues () {
         this.$nextTick(() => {
           if (this.scrollHeight() <= this.listHeight() && this.list.issuesSize > this.list.issues.length) {
-            this.list.page++;
+            this.list.page += 1;
             this.list.getIssues(false);
           }
 
diff --git a/app/assets/javascripts/boards/components/new_list_dropdown.js.es6 b/app/assets/javascripts/boards/components/new_list_dropdown.js.es6
index 3f5cf8420a8..556826a9148 100644
--- a/app/assets/javascripts/boards/components/new_list_dropdown.js.es6
+++ b/app/assets/javascripts/boards/components/new_list_dropdown.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, func-names, no-new, space-before-function-paren, one-var, indent */
+/* eslint-disable comma-dangle, func-names, no-new, space-before-function-paren, one-var */
 
 (() => {
   window.gl = window.gl || {};
@@ -32,17 +32,17 @@
             });
         },
         renderRow (label) {
-          const active = Store.findList('title', label.title),
-                $li = $('<li />'),
-                $a = $('<a />', {
-                  class: (active ? `is-active js-board-list-${active.id}` : ''),
-                  text: label.title,
-                  href: '#'
-                }),
-                $labelColor = $('<span />', {
-                  class: 'dropdown-label-box',
-                  style: `background-color: ${label.color}`
-                });
+          const active = Store.findList('title', label.title);
+          const $li = $('<li />');
+          const $a = $('<a />', {
+            class: (active ? `is-active js-board-list-${active.id}` : ''),
+            text: label.title,
+            href: '#'
+          });
+          const $labelColor = $('<span />', {
+            class: 'dropdown-label-box',
+            style: `background-color: ${label.color}`
+          });
 
           return $li.append($a.prepend($labelColor));
         },
diff --git a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
index d5859444a32..b6c6d17274f 100644
--- a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
+++ b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-vars, no-mixed-operators, prefer-const, comma-dangle, semi */
+/* eslint-disable no-unused-vars, no-mixed-operators, comma-dangle */
 /* global DocumentTouch */
 
 ((w) => {
@@ -19,7 +19,7 @@
   gl.issueBoards.touchEnabled = ('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch;
 
   gl.issueBoards.getBoardSortableDefaultOptions = (obj) => {
-    let defaultSortOptions = {
+    const defaultSortOptions = {
       animation: 200,
       forceFallback: true,
       fallbackClass: 'is-dragging',
@@ -31,7 +31,7 @@
       scrollSpeed: 20,
       onStart: gl.issueBoards.onStart,
       onEnd: gl.issueBoards.onEnd
-    }
+    };
 
     Object.keys(obj).forEach((key) => { defaultSortOptions[key] = obj[key]; });
     return defaultSortOptions;
diff --git a/app/assets/javascripts/boards/models/issue.js.es6 b/app/assets/javascripts/boards/models/issue.js.es6
index cd942c8332b..31531c3ee34 100644
--- a/app/assets/javascripts/boards/models/issue.js.es6
+++ b/app/assets/javascripts/boards/models/issue.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-vars, space-before-function-paren, arrow-body-style, space-in-parens, arrow-parens, comma-dangle, max-len */
+/* eslint-disable no-unused-vars, space-before-function-paren, arrow-body-style, arrow-parens, comma-dangle, max-len */
 /* global Vue */
 /* global ListLabel */
 /* global ListMilestone */
@@ -37,12 +37,12 @@ class ListIssue {
   }
 
   findLabel (findLabel) {
-    return this.labels.filter( label => label.title === findLabel.title )[0];
+    return this.labels.filter(label => label.title === findLabel.title)[0];
   }
 
   removeLabel (removeLabel) {
     if (removeLabel) {
-      this.labels = this.labels.filter( label => removeLabel.title !== label.title );
+      this.labels = this.labels.filter(label => removeLabel.title !== label.title);
     }
   }
 
@@ -51,7 +51,7 @@ class ListIssue {
   }
 
   getLists () {
-    return gl.issueBoards.BoardsStore.state.lists.filter( list => list.findIssue(this.id) );
+    return gl.issueBoards.BoardsStore.state.lists.filter(list => list.findIssue(this.id));
   }
 
   update (url) {
@@ -60,7 +60,7 @@ class ListIssue {
         milestone_id: this.milestone ? this.milestone.id : null,
         due_date: this.dueDate,
         assignee_id: this.assignee ? this.assignee.id : null,
-        label_ids: this.labels.map( (label) => label.id )
+        label_ids: this.labels.map((label) => label.id)
       }
     };
 
diff --git a/app/assets/javascripts/boards/models/list.js.es6 b/app/assets/javascripts/boards/models/list.js.es6
index fb13f529b11..3dd5f273057 100644
--- a/app/assets/javascripts/boards/models/list.js.es6
+++ b/app/assets/javascripts/boards/models/list.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable space-before-function-paren, no-underscore-dangle, class-methods-use-this, consistent-return, no-plusplus, prefer-const, space-in-parens, no-shadow, no-param-reassign, max-len, no-unused-vars */
+/* eslint-disable space-before-function-paren, no-underscore-dangle, class-methods-use-this, consistent-return, no-shadow, no-param-reassign, max-len, no-unused-vars */
 /* global ListIssue */
 /* global ListLabel */
 
@@ -58,7 +58,7 @@ class List {
 
   nextPage () {
     if (this.issuesSize > this.issues.length) {
-      this.page++;
+      this.page += 1;
 
       return this.getIssues(false);
     }
@@ -66,12 +66,12 @@ class List {
 
   getIssues (emptyIssues = true) {
     const filters = this.filters;
-    let data = { page: this.page };
+    const data = { page: this.page };
 
     Object.keys(filters).forEach((key) => { data[key] = filters[key]; });
 
     if (this.label) {
-      data.label_name = data.label_name.filter( label => label !== this.label.title );
+      data.label_name = data.label_name.filter(label => label !== this.label.title);
     }
 
     if (emptyIssues) {
@@ -94,7 +94,7 @@ class List {
 
   newIssue (issue) {
     this.addIssue(issue);
-    this.issuesSize++;
+    this.issuesSize += 1;
 
     return gl.boardService.newIssue(this.id, issue)
       .then((resp) => {
@@ -122,7 +122,7 @@ class List {
       }
 
       if (listFrom) {
-        this.issuesSize++;
+        this.issuesSize += 1;
         gl.boardService.moveIssue(issue.id, listFrom.id, this.id)
           .then(() => {
             listFrom.getIssues(false);
@@ -132,7 +132,7 @@ class List {
   }
 
   findIssue (id) {
-    return this.issues.filter( issue => issue.id === id )[0];
+    return this.issues.filter(issue => issue.id === id)[0];
   }
 
   removeIssue (removeIssue) {
@@ -140,7 +140,7 @@ class List {
       const matchesRemove = removeIssue.id === issue.id;
 
       if (matchesRemove) {
-        this.issuesSize--;
+        this.issuesSize -= 1;
         issue.removeLabel(this.label);
       }
 
diff --git a/app/assets/javascripts/boards/services/board_service.js.es6 b/app/assets/javascripts/boards/services/board_service.js.es6
index f18633f0913..ea55158306b 100644
--- a/app/assets/javascripts/boards/services/board_service.js.es6
+++ b/app/assets/javascripts/boards/services/board_service.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable space-before-function-paren, comma-dangle, no-param-reassign, camelcase, prefer-const, no-extra-semi, max-len, no-unused-vars */
+/* eslint-disable space-before-function-paren, comma-dangle, no-param-reassign, camelcase, max-len, no-unused-vars */
 /* global Vue */
 
 class BoardService {
@@ -47,7 +47,7 @@ class BoardService {
   }
 
   getIssuesForList (id, filter = {}) {
-    let data = { id };
+    const data = { id };
     Object.keys(filter).forEach((key) => { data[key] = filter[key]; });
 
     return this.issues.get(data);
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6
index e7a14ea5bca..cdf1b09c0a4 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js.es6
+++ b/app/assets/javascripts/boards/stores/boards_store.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable comma-dangle, space-before-function-paren, one-var, indent, space-in-parens, no-shadow, radix, dot-notation, semi, max-len */
+/* eslint-disable comma-dangle, space-before-function-paren, one-var, no-shadow, dot-notation, max-len */
 /* global Cookies */
 /* global List */
 
@@ -33,8 +33,8 @@
       return list;
     },
     new (listObj) {
-      const list = this.addList(listObj),
-            backlogList = this.findList('type', 'backlog', 'backlog');
+      const list = this.addList(listObj);
+      const backlogList = this.findList('type', 'backlog', 'backlog');
 
       list
         .save()
@@ -52,7 +52,7 @@
     },
     shouldAddBlankState () {
       // Decide whether to add the blank state
-      return !(this.state.lists.filter( list => list.type !== 'backlog' && list.type !== 'done' )[0]);
+      return !(this.state.lists.filter(list => list.type !== 'backlog' && list.type !== 'done')[0]);
     },
     addBlankState () {
       if (!this.shouldAddBlankState() || this.welcomeIsHidden() || this.disabled) return;
@@ -82,20 +82,20 @@
 
       if (!list) return;
 
-      this.state.lists = this.state.lists.filter( list => list.id !== id );
+      this.state.lists = this.state.lists.filter(list => list.id !== id);
     },
     moveList (listFrom, orderLists) {
       orderLists.forEach((id, i) => {
-        const list = this.findList('id', parseInt(id));
+        const list = this.findList('id', parseInt(id, 10));
 
         list.position = i;
       });
       listFrom.update();
     },
     moveIssueToList (listFrom, listTo, issue, newIndex) {
-      const issueTo = listTo.findIssue(issue.id),
-            issueLists = issue.getLists(),
-            listLabels = issueLists.map( listIssue => listIssue.label );
+      const issueTo = listTo.findIssue(issue.id);
+      const issueLists = issue.getLists();
+      const listLabels = issueLists.map(listIssue => listIssue.label);
 
       // Add to new lists issues if it doesn't already exist
       if (!issueTo) {
@@ -105,7 +105,7 @@
       if (listTo.type === 'done' && listFrom.type !== 'backlog') {
         issueLists.forEach((list) => {
           list.removeIssue(issue);
-        })
+        });
         issue.removeLabels(listLabels);
       } else {
         listFrom.removeIssue(issue);
diff --git a/app/assets/javascripts/boards/test_utils/simulate_drag.js b/app/assets/javascripts/boards/test_utils/simulate_drag.js
index 01e09ec482e..f05780167bf 100644
--- a/app/assets/javascripts/boards/test_utils/simulate_drag.js
+++ b/app/assets/javascripts/boards/test_utils/simulate_drag.js
@@ -1,120 +1,119 @@
-/* eslint-disable wrap-iife, func-names, strict, indent, no-tabs, no-var, vars-on-top, no-param-reassign, object-shorthand, no-shadow, comma-dangle, prefer-template, consistent-return, no-mixed-operators, no-unused-vars, object-curly-spacing, no-unused-expressions, prefer-arrow-callback, max-len */
+/* eslint-disable wrap-iife, func-names, strict, no-var, vars-on-top, no-param-reassign, object-shorthand, no-shadow, comma-dangle, prefer-template, consistent-return, no-mixed-operators, no-unused-vars, no-unused-expressions, prefer-arrow-callback, max-len */
 (function () {
-	'use strict';
-
-	function simulateEvent(el, type, options) {
-		var event;
-		if (!el) return;
-		var ownerDocument = el.ownerDocument;
-
-		options = options || {};
-
-		if (/^mouse/.test(type)) {
-			event = ownerDocument.createEvent('MouseEvents');
-			event.initMouseEvent(type, true, true, ownerDocument.defaultView,
-				options.button, options.screenX, options.screenY, options.clientX, options.clientY,
-				options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.button, el);
-		} else {
-			event = ownerDocument.createEvent('CustomEvent');
-
-			event.initCustomEvent(type, true, true, ownerDocument.defaultView,
-				options.button, options.screenX, options.screenY, options.clientX, options.clientY,
-				options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.button, el);
-
-			event.dataTransfer = {
-				data: {},
-
-				setData: function (type, val) {
-					this.data[type] = val;
-				},
-
-				getData: function (type) {
-					return this.data[type];
-				}
-			};
-		}
-
-		if (el.dispatchEvent) {
-			el.dispatchEvent(event);
-		} else if (el.fireEvent) {
-			el.fireEvent('on' + type, event);
-		}
-
-		return event;
-	}
-
-	function getTraget(target) {
-		var el = typeof target.el === 'string' ? document.getElementById(target.el.substr(1)) : target.el;
-		var children = el.children;
-
-		return (
-			children[target.index] ||
-			children[target.index === 'first' ? 0 : -1] ||
-			children[target.index === 'last' ? children.length - 1 : -1]
-		);
-	}
-
-	function getRect(el) {
-		var rect = el.getBoundingClientRect();
-		var width = rect.right - rect.left;
-		var height = rect.bottom - rect.top;
-
-		return {
-			x: rect.left,
-			y: rect.top,
-			cx: rect.left + width / 2,
-			cy: rect.top + height / 2,
-			w: width,
-			h: height,
-			hw: width / 2,
-			wh: height / 2
-		};
-	}
-
-	function simulateDrag(options, callback) {
-		options.to.el = options.to.el || options.from.el;
-
-		var fromEl = getTraget(options.from);
-		var toEl = getTraget(options.to);
+  'use strict';
+
+  function simulateEvent(el, type, options) {
+    var event;
+    if (!el) return;
+    var ownerDocument = el.ownerDocument;
+
+    options = options || {};
+
+    if (/^mouse/.test(type)) {
+      event = ownerDocument.createEvent('MouseEvents');
+      event.initMouseEvent(type, true, true, ownerDocument.defaultView,
+      options.button, options.screenX, options.screenY, options.clientX, options.clientY,
+      options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.button, el);
+    } else {
+      event = ownerDocument.createEvent('CustomEvent');
+
+      event.initCustomEvent(type, true, true, ownerDocument.defaultView,
+      options.button, options.screenX, options.screenY, options.clientX, options.clientY,
+      options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.button, el);
+
+      event.dataTransfer = {
+        data: {},
+
+        setData: function (type, val) {
+          this.data[type] = val;
+        },
+
+        getData: function (type) {
+          return this.data[type];
+        }
+      };
+    }
+
+    if (el.dispatchEvent) {
+      el.dispatchEvent(event);
+    } else if (el.fireEvent) {
+      el.fireEvent('on' + type, event);
+    }
+
+    return event;
+  }
+
+  function getTraget(target) {
+    var el = typeof target.el === 'string' ? document.getElementById(target.el.substr(1)) : target.el;
+    var children = el.children;
+
+    return (
+      children[target.index] ||
+      children[target.index === 'first' ? 0 : -1] ||
+      children[target.index === 'last' ? children.length - 1 : -1]
+    );
+  }
+
+  function getRect(el) {
+    var rect = el.getBoundingClientRect();
+    var width = rect.right - rect.left;
+    var height = rect.bottom - rect.top;
+
+    return {
+      x: rect.left,
+      y: rect.top,
+      cx: rect.left + width / 2,
+      cy: rect.top + height / 2,
+      w: width,
+      h: height,
+      hw: width / 2,
+      wh: height / 2
+    };
+  }
+
+  function simulateDrag(options, callback) {
+    options.to.el = options.to.el || options.from.el;
+
+    var fromEl = getTraget(options.from);
+    var toEl = getTraget(options.to);
     var scrollable = options.scrollable;
 
-		var fromRect = getRect(fromEl);
-		var toRect = getRect(toEl);
-
-		var startTime = new Date().getTime();
-		var duration = options.duration || 1000;
-		simulateEvent(fromEl, 'mousedown', {button: 0});
-		options.ontap && options.ontap();
-		window.SIMULATE_DRAG_ACTIVE = 1;
-
-		var dragInterval = setInterval(function loop() {
-			var progress = (new Date().getTime() - startTime) / duration;
-			var x = (fromRect.cx + (toRect.cx - fromRect.cx) * progress) - scrollable.scrollLeft;
-			var y = (fromRect.cy + (toRect.cy - fromRect.cy) * progress) - scrollable.scrollTop;
-			var overEl = fromEl.ownerDocument.elementFromPoint(x, y);
-
-			simulateEvent(overEl, 'mousemove', {
-				clientX: x,
-				clientY: y
-			});
-
-			if (progress >= 1) {
-				options.ondragend && options.ondragend();
-				simulateEvent(toEl, 'mouseup');
-				clearInterval(dragInterval);
-				window.SIMULATE_DRAG_ACTIVE = 0;
-			}
-		}, 100);
-
-		return {
-			target: fromEl,
-			fromList: fromEl.parentNode,
-			toList: toEl.parentNode
-		};
-	}
-
-
-	// Export
-	window.simulateEvent = simulateEvent;
-	window.simulateDrag = simulateDrag;
+    var fromRect = getRect(fromEl);
+    var toRect = getRect(toEl);
+
+    var startTime = new Date().getTime();
+    var duration = options.duration || 1000;
+    simulateEvent(fromEl, 'mousedown', { button: 0 });
+    options.ontap && options.ontap();
+    window.SIMULATE_DRAG_ACTIVE = 1;
+
+    var dragInterval = setInterval(function loop() {
+      var progress = (new Date().getTime() - startTime) / duration;
+      var x = (fromRect.cx + (toRect.cx - fromRect.cx) * progress) - scrollable.scrollLeft;
+      var y = (fromRect.cy + (toRect.cy - fromRect.cy) * progress) - scrollable.scrollTop;
+      var overEl = fromEl.ownerDocument.elementFromPoint(x, y);
+
+      simulateEvent(overEl, 'mousemove', {
+        clientX: x,
+        clientY: y
+      });
+
+      if (progress >= 1) {
+        options.ondragend && options.ondragend();
+        simulateEvent(toEl, 'mouseup');
+        clearInterval(dragInterval);
+        window.SIMULATE_DRAG_ACTIVE = 0;
+      }
+    }, 100);
+
+    return {
+      target: fromEl,
+      fromList: fromEl.parentNode,
+      toList: toEl.parentNode
+    };
+  }
+
+  // Export
+  window.simulateEvent = simulateEvent;
+  window.simulateDrag = simulateDrag;
 })();
diff --git a/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 b/app/assets/javascripts/boards/vue_resource_interceptor.js.es6
index 3723a2039f9..54c2b4ad369 100644
--- a/app/assets/javascripts/boards/vue_resource_interceptor.js.es6
+++ b/app/assets/javascripts/boards/vue_resource_interceptor.js.es6
@@ -1,10 +1,10 @@
-/* eslint-disable func-names, prefer-arrow-callback, no-unused-vars, no-plusplus */
+/* eslint-disable func-names, prefer-arrow-callback, no-unused-vars */
 /* global Vue */
 
 Vue.http.interceptors.push((request, next) => {
   Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1;
 
   next(function (response) {
-    Vue.activeResources--;
+    Vue.activeResources -= 1;
   });
 });