diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-18 11:28:02 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-18 11:28:02 +0000 |
| commit | 3870a1bde276144a05a31185ede7a5032818d489 (patch) | |
| tree | 0e8d69c1859be1d59de6a2edd1abf599d3618948 /app/assets/javascripts | |
| parent | c20720cf84132d7bf14763aba0570bd8882f9c6d (diff) | |
| parent | cba40a1f551e4c1b46bfa49a709f59feb59782bd (diff) | |
| download | gitlab-ce-3870a1bde276144a05a31185ede7a5032818d489.tar.gz | |
Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'
Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests
See merge request gitlab-org/gitlab-ce!15847
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js | 2 |
1 files changed, 1 insertions, 1 deletions
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 99f5c305df5..5fa838baba3 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.statusPath); + this.mergeCheckResource = Vue.resource(`${endpoints.statusPath}?serializer=widget`); this.cancelAutoMergeResource = Vue.resource(endpoints.cancelAutoMergePath); this.removeWIPResource = Vue.resource(endpoints.removeWIPPath); this.removeSourceBranchResource = Vue.resource(endpoints.sourceBranchPath); |