diff options
author | Mike Greiling <mike@pixelcog.com> | 2016-11-03 16:38:54 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:38 -0600 |
commit | fe964cc235ed22a5d013d5874284763b698aba7c (patch) | |
tree | 5529dd7d9deb13d511d37f7a8fed33de15aa6d7c /app/assets/javascripts/merge_request.js | |
parent | 55f291e8ceae6d3d432039f72f6935c62fb2a872 (diff) | |
download | gitlab-ce-fe964cc235ed22a5d013d5874284763b698aba7c.tar.gz |
migrate all javascript asset bundles and require 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 244c2f6746c..19526157410 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, space-before-blocks, 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, padded-blocks, max-len, prefer-arrow-callback */ /* global MergeRequestTabs */ -/*= require jquery.waitforimages */ -/*= require task_list */ -/*= require merge_request_tabs */ +require('vendor/jquery.waitforimages'); +require('vendor/task_list'); +require('./merge_request_tabs'); (function() { var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }; |