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 /spec/javascripts/shortcuts_issuable_spec.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 'spec/javascripts/shortcuts_issuable_spec.js')
| -rw-r--r-- | spec/javascripts/shortcuts_issuable_spec.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/javascripts/shortcuts_issuable_spec.js b/spec/javascripts/shortcuts_issuable_spec.js index c2894d6f3ea..386fc8f514e 100644 --- a/spec/javascripts/shortcuts_issuable_spec.js +++ b/spec/javascripts/shortcuts_issuable_spec.js @@ -1,4 +1,4 @@ -/* eslint-disable space-before-function-paren, no-return-assign, no-var, quotes, padded-blocks */ +/* eslint-disable space-before-function-paren, no-return-assign, no-var, quotes */ /* global ShortcutsIssuable */ /*= require copy_as_gfm */ @@ -78,5 +78,4 @@ }); }); }); - }).call(this); |