diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-30 11:19:07 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-30 11:19:07 +0000 |
commit | 46d8209e8c525ec619693c4e09ace3ef59c64d5f (patch) | |
tree | 94d1afe86054f7d52cb743abb52db3532a835681 /app/assets/javascripts/issuable_form.js | |
parent | 94743e0e8fa80f9dc2f2200f33c7047e859ee12d (diff) | |
parent | 6919f6361c3cfa87a38cd7eb391ade70823c9106 (diff) | |
download | gitlab-ce-46d8209e8c525ec619693c4e09ace3ef59c64d5f.tar.gz |
Merge branch 'master' into 38869-importer_status
* master: (51 commits)
Move locked check to a guard-clause
Ci::Build tag is a trait instead of an own factory
[CE backport] Saved configuration for issue board
Use the correct project visibility in system hooks
Add changelog
more readable changelog
Make merge_jid handling less stateful in MergeService
Fetch the merged branches at once
remove extra whitespace
use a delegate for `username` to be more future friendly
Merging EE doc into CE
add changelog entry
Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
Cache commits on the repository model
Remove groups_select from global namespace & simplifies the code
Change default disabled merge request widget message to "Merge is not allowed yet"
Semi-linear history merge is now available in CE.
Remove repetitive karma spec
Improve spec to check hidden component
Rename to shouldShowUsername
...
Diffstat (limited to 'app/assets/javascripts/issuable_form.js')
-rw-r--r-- | app/assets/javascripts/issuable_form.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/issuable_form.js b/app/assets/javascripts/issuable_form.js index 765c84f673a..57dcaa0e1ac 100644 --- a/app/assets/javascripts/issuable_form.js +++ b/app/assets/javascripts/issuable_form.js @@ -1,8 +1,8 @@ /* eslint-disable func-names, prefer-rest-params, wrap-iife, no-use-before-define, no-useless-escape, no-new, object-shorthand, no-unused-vars, comma-dangle, no-alert, consistent-return, no-else-return, prefer-template, one-var, one-var-declaration-per-line, curly, max-len */ /* global GitLab */ -/* global Autosave */ import Pikaday from 'pikaday'; +import Autosave from './autosave'; import UsersSelect from './users_select'; import GfmAutoComplete from './gfm_auto_complete'; import ZenMode from './zen_mode'; |