diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-06 19:14:34 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-09 11:54:27 +0300 |
commit | 96e6fc70b40c51af50bee6c421f7f363acd899d4 (patch) | |
tree | 1bcdec4ae4d83d08c5a2c43573df64edd7d309d7 /app/assets/javascripts/vue_merge_request_widget | |
parent | 6a1b84c7b450e65eaad6bf016fc9b7310e89784c (diff) |
Import modules instead of using the ones in global namespace
Removes set favicon related methods from global scope
Improves test related with favicon
Removes convertPermissionToBoolean from global scope.
Adds tests for convertPermissionToBoolean - were non existant
Removes setParamInURL from gl.utils
Removes parseIntPagination from gl.utils namespace
Remove normalizeCRLFHeaders from gl.utils namespace
Removes normalizeHeaders from gl.utils namespace
Use gl.utils for filtered search
Fix bad import
Fix broken test by cleaning window.history namespace
Adds changelog
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js index 0042c48816f..fa4411e716b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js @@ -31,6 +31,7 @@ import { SquashBeforeMerge, notify, } from './dependencies'; +import { setFavicon } from '../lib/utils/common_utils'; export default { el: '#js-vue-mr-widget', @@ -86,7 +87,7 @@ export default { .then((res) => { this.handleNotification(res); this.mr.setData(res); - this.setFavicon(); + this.setFaviconHelper(); if (cb) { cb.call(null, res); @@ -115,9 +116,9 @@ export default { immediateExecution: true, }); }, - setFavicon() { + setFaviconHelper() { if (this.mr.ciStatusFaviconPath) { - gl.utils.setFavicon(this.mr.ciStatusFaviconPath); + setFavicon(this.mr.ciStatusFaviconPath); } }, fetchDeployments() { @@ -193,7 +194,7 @@ export default { }); }, handleMounted() { - this.setFavicon(); + this.setFaviconHelper(); this.initDeploymentsPolling(); }, }, |