diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-05-16 15:52:40 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-05-16 15:52:40 -0500 |
| commit | 5bd549187aa68604d320e3d0c1a51ee4ed34c0e3 (patch) | |
| tree | 4f121959a46a895d67963919f549507947a305a5 /app/assets/javascripts/merge_request.js | |
| parent | f5ad1dcbf88dc69254fe86be2fd6b20fead308c0 (diff) | |
| download | gitlab-ce-5bd549187aa68604d320e3d0c1a51ee4ed34c0e3.tar.gz | |
update remaining uses of CJS syntax to ES module syntax
Diffstat (limited to 'app/assets/javascripts/merge_request.js')
| -rw-r--r-- | app/assets/javascripts/merge_request.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index d1cdcadf87d..f93feeec1c2 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -1,9 +1,9 @@ /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, dot-notation, quote-props, comma-dangle, object-shorthand, max-len, prefer-arrow-callback */ /* global MergeRequestTabs */ -require('vendor/jquery.waitforimages'); -require('./task_list'); -require('./merge_request_tabs'); +import 'vendor/jquery.waitforimages'; +import './task_list'; +import './merge_request_tabs'; (function() { this.MergeRequest = (function() { |