diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-19 22:52:45 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-19 22:52:45 +0300 |
| commit | 5460153c9f1a0b1679e4f31f1d588cb77857b714 (patch) | |
| tree | bbee0c9665f835a7834995374b15ab32d86eded9 /app/assets/javascripts/vue_merge_request_widget | |
| parent | db4bbbabcafa78cfa0176fefac1b4c1dd33d098f (diff) | |
| parent | b3cf3d046b8a319c0dbca7cb9aeaea027c080e6f (diff) | |
Merge branch '32536-mr-widget-performance-improvements' into 'master'
Load improvements related to MR widget
See merge request !11518
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js | 2 |
2 files changed, 1 insertions, 2 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 5452e19bd8e..99600b6664e 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 @@ -175,7 +175,6 @@ export default { }); }, handleMounted() { - this.checkStatus(); this.setFavicon(); this.initDeploymentsPolling(); }, diff --git a/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js b/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js index 42493be3372..79c3d335679 100644 --- a/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js +++ b/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js @@ -6,7 +6,7 @@ Vue.use(VueResource); export default class MRWidgetService { constructor(endpoints) { this.mergeResource = Vue.resource(endpoints.mergePath); - this.mergeCheckResource = Vue.resource(endpoints.mergeCheckPath); + this.mergeCheckResource = Vue.resource(endpoints.statusPath); this.cancelAutoMergeResource = Vue.resource(endpoints.cancelAutoMergePath); this.removeWIPResource = Vue.resource(endpoints.removeWIPPath); this.removeSourceBranchResource = Vue.resource(endpoints.sourceBranchPath); |