diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-03-09 23:18:59 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-03-10 00:18:09 +0300 |
| commit | f248be7257e82d15fa6441c551e4314bd36343d4 (patch) | |
| tree | 773b6eefd1ae186432ec1c5fa469d80dbcec4349 /app/assets/javascripts/merge_conflicts | |
| parent | c591cf539072f8ef25ed5afc162bc7e87348cc15 (diff) | |
require jQuery to be explicitly imported
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index 8be7314ded8..db1d09eb2f2 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js @@ -1,5 +1,6 @@ /* eslint-disable comma-dangle, object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue, max-len */ +import $ from 'jquery'; import Vue from 'vue'; import Cookies from 'js-cookie'; diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index 66b258839ae..4abd5433bb5 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -1,5 +1,6 @@ /* eslint-disable new-cap, comma-dangle, no-new */ +import $ from 'jquery'; import Vue from 'vue'; import Flash from '../flash'; import initIssuableSidebar from '../init_issuable_sidebar'; |