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, 6 insertions, 8 deletions

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index db9df8cdd3c..9d776b74965 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -1,11 +1,11 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, no-var, spaced-comment, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, no-unused-vars, no-else-return, prefer-template, quotes, comma-dangle, no-param-reassign, no-void, radix, keyword-spacing, space-before-blocks, brace-style, no-underscore-dangle, no-plusplus, no-return-assign, camelcase, padded-blocks */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, no-var, prefer-arrow-callback, consistent-return, one-var, one-var-declaration-per-line, no-unused-vars, no-else-return, prefer-template, quotes, comma-dangle, no-param-reassign, no-void, brace-style, no-underscore-dangle, no-return-assign, camelcase */
 /* global Cookies */
 
 var emojiAliases = require('emoji-aliases');
 
 (function() {
   this.AwardsHandler = (function() {
-    var FROM_SENTENCE_REGEX = /(?:, and | and |, )/; //For separating lists produced by ruby's Array#toSentence
+    var FROM_SENTENCE_REGEX = /(?:, and | and |, )/; // For separating lists produced by ruby's Array#toSentence
     function AwardsHandler() {
       this.aliases = emojiAliases;
       $(document).off('click', '.js-add-award').on('click', '.js-add-award', (function(_this) {
@@ -136,7 +136,7 @@ var emojiAliases = require('emoji-aliases');
           return this.decrementCounter($emojiButton, emoji);
         } else {
           counter = $emojiButton.find('.js-counter');
-          counter.text(parseInt(counter.text()) + 1);
+          counter.text(parseInt(counter.text(), 10) + 1);
           $emojiButton.addClass('active');
           this.addYouToUserList(votesBlock, emoji);
           return this.animateEmoji($emojiButton);
@@ -213,10 +213,10 @@ var emojiAliases = require('emoji-aliases');
     };
 
     AwardsHandler.prototype.toSentence = function(list) {
-      if(list.length <= 2){
+      if (list.length <= 2) {
         return list.join(' and ');
       }
-      else{
+      else {
         return list.slice(0, -1).join(', ') + ', and ' + list[list.length - 1];
       }
     };
@@ -341,7 +341,7 @@ var emojiAliases = require('emoji-aliases');
       if (Cookies.get('frequently_used_emojis')) {
         frequentlyUsedEmojis = this.getFrequentlyUsedEmojis();
         ul = $("<ul class='clearfix emoji-menu-list frequent-emojis'>");
-        for (i = 0, len = frequentlyUsedEmojis.length; i < len; i++) {
+        for (i = 0, len = frequentlyUsedEmojis.length; i < len; i += 1) {
           emoji = frequentlyUsedEmojis[i];
           $(".emoji-menu-content [data-emoji='" + emoji + "']").closest('li').clone().appendTo(ul);
         }
@@ -376,7 +376,5 @@ var emojiAliases = require('emoji-aliases');
     };
 
     return AwardsHandler;
-
   })();
-
 }).call(this);