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

1 files changed, 9 insertions, 9 deletions

diff --git a/spec/javascripts/activities_spec.js.es6 b/spec/javascripts/activities_spec.js.es6
index aba16a03ce2..e6a6fc36ca1 100644
--- a/spec/javascripts/activities_spec.js.es6
+++ b/spec/javascripts/activities_spec.js.es6
@@ -1,4 +1,4 @@
-/* eslint-disable no-unused-expressions, comma-spacing, prefer-const, no-prototype-builtins, semi, no-new, keyword-spacing, no-plusplus, no-shadow, max-len */
+/* eslint-disable no-unused-expressions, no-prototype-builtins, no-new, no-shadow, max-len */
 
 require('vendor/jquery.endless-scroll.js');
 require('~/pager');
@@ -18,18 +18,18 @@ require('~/activities');
       name: 'merge events',
     }, {
       id: 'comments',
-    },{
+    }, {
       id: 'team',
     }];
 
   function getEventName(index) {
-    let filter = filters[index];
+    const filter = filters[index];
     return filter.hasOwnProperty('name') ? filter.name : filter.id;
   }
 
   function getSelector(index) {
-    let filter = filters[index];
-    return `#${filter.id}_event_filter`
+    const filter = filters[index];
+    return `#${filter.id}_event_filter`;
   }
 
   describe('Activities', () => {
@@ -38,17 +38,17 @@ require('~/activities');
       new gl.Activities();
     });
 
-    for(let i = 0; i < filters.length; i++) {
+    for (let i = 0; i < filters.length; i += 1) {
       ((i) => {
         describe(`when selecting ${getEventName(i)}`, () => {
           beforeEach(() => {
             $(getSelector(i)).click();
           });
 
-          for(let x = 0; x < filters.length; x++) {
+          for (let x = 0; x < filters.length; x += 1) {
             ((x) => {
-              let shouldHighlight = i === x;
-              let testName = shouldHighlight ? 'should highlight' : 'should not highlight';
+              const shouldHighlight = i === x;
+              const testName = shouldHighlight ? 'should highlight' : 'should not highlight';
 
               it(`${testName} ${getEventName(x)}`, () => {
                 expect($(getSelector(x)).parent().hasClass('active')).toEqual(shouldHighlight);