diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-01-19 10:08:11 -0600 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-01-19 10:08:11 -0600 |
commit | 2b37e4c1995284a4871d6d7077b0884e95c2496e (patch) | |
tree | 615e0a3c063ac7e93001434a4a0932cb061e8cc9 /app/assets/javascripts/shortcuts_issuable.js | |
parent | f928e19cb572b34d93baaa5e3040d99fc5ba9939 (diff) | |
parent | 52762df285751dec4e54c4c55be5bbecb3bd4fc9 (diff) | |
download | gitlab-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/shortcuts_issuable.js')
-rw-r--r-- | app/assets/javascripts/shortcuts_issuable.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/shortcuts_issuable.js b/app/assets/javascripts/shortcuts_issuable.js index 97fa68c8437..28491934c10 100644 --- a/app/assets/javascripts/shortcuts_issuable.js +++ b/app/assets/javascripts/shortcuts_issuable.js @@ -1,4 +1,4 @@ -/* eslint-disable func-names, space-before-function-paren, max-len, no-var, one-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, one-var-declaration-per-line, quotes, prefer-arrow-callback, consistent-return, prefer-template, no-mixed-operators, padded-blocks */ +/* eslint-disable func-names, space-before-function-paren, max-len, no-var, one-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, one-var-declaration-per-line, quotes, prefer-arrow-callback, consistent-return, prefer-template, no-mixed-operators */ /* global Mousetrap */ /* global Turbolinks */ /* global ShortcutsNavigation */ @@ -86,7 +86,5 @@ }; return ShortcutsIssuable; - })(ShortcutsNavigation); - }).call(this); |