summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/star.js
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-01-19 10:08:11 -0600
committerDouwe Maan <douwe@selenight.nl>2017-01-19 10:08:11 -0600
commit2b37e4c1995284a4871d6d7077b0884e95c2496e (patch)
tree615e0a3c063ac7e93001434a4a0932cb061e8cc9 /app/assets/javascripts/star.js
parentf928e19cb572b34d93baaa5e3040d99fc5ba9939 (diff)
parent52762df285751dec4e54c4c55be5bbecb3bd4fc9 (diff)
downloadgitlab-ce-2b37e4c1995284a4871d6d7077b0884e95c2496e.tar.gz
Merge branch 'master' into copy-as-md
# Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
Diffstat (limited to 'app/assets/javascripts/star.js')
-rw-r--r--app/assets/javascripts/star.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js
index f1fc526bf2e..531fd0e9c32 100644
--- a/app/assets/javascripts/star.js
+++ b/app/assets/javascripts/star.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-unused-vars, one-var, no-var, one-var-declaration-per-line, prefer-arrow-callback, no-new, padded-blocks, max-len */
+/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-unused-vars, one-var, no-var, one-var-declaration-per-line, prefer-arrow-callback, no-new, max-len */
/* global Flash */
(function() {
@@ -26,7 +26,5 @@
}
return Star;
-
})();
-
}).call(this);