diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-03-21 18:26:06 +0000 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-03-21 18:26:06 +0000 |
| commit | 2bb3e4c6e389915d2702ffcfaff5d31b6a41f582 (patch) | |
| tree | da71c857eee52a4f9ac4705ca3f06c9ec7dd9384 /app/assets/javascripts/shared | |
| parent | 5595afe807c3c11d9c695c558da1210a25544387 (diff) | |
| parent | 9027d023a58c8ac803bc114c6213b1f124a978a2 (diff) | |
| download | gitlab-ce-2bb3e4c6e389915d2702ffcfaff5d31b6a41f582.tar.gz | |
Merge remote-tracking branch 'origin/master' into deprecation-warning-for-dynamic-milestones
Diffstat (limited to 'app/assets/javascripts/shared')
| -rw-r--r-- | app/assets/javascripts/shared/milestones/form.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/shared/sessions/u2f.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/shared/milestones/form.js b/app/assets/javascripts/shared/milestones/form.js index db466f722c4..2f974d6ff9d 100644 --- a/app/assets/javascripts/shared/milestones/form.js +++ b/app/assets/javascripts/shared/milestones/form.js @@ -1,3 +1,4 @@ +import $ from 'jquery'; import ZenMode from '../../zen_mode'; import DueDateSelectors from '../../due_date_select'; import GLForm from '../../gl_form'; diff --git a/app/assets/javascripts/shared/sessions/u2f.js b/app/assets/javascripts/shared/sessions/u2f.js index 1d075f7e872..6ae9faf1dde 100644 --- a/app/assets/javascripts/shared/sessions/u2f.js +++ b/app/assets/javascripts/shared/sessions/u2f.js @@ -1,3 +1,4 @@ +import $ from 'jquery'; import U2FAuthenticate from '../../u2f/authenticate'; export default () => { |