diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-25 10:38:54 +0100 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-10-26 12:26:21 +0200 |
| commit | 36474f1f7751f4bb4711f063744f28fc0c693221 (patch) | |
| tree | 2b43a2aa7e6a72b3918abd590131c10c72b51962 | |
| parent | d7c3d5ffcb69f42091ec837145d1fb2891707294 (diff) | |
| download | gitlab-ce-36474f1f7751f4bb4711f063744f28fc0c693221.tar.gz | |
Updates params in axios request for post merge deploy
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 493dc1171a5..b2b8131559c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -216,7 +216,7 @@ export default { .catch(() => this.throwDeploymentsError()); }, fetchPostMergeDeployments(){ - return this.fetchDeployments('merge') + return this.fetchDeployments('merge_commit') .then(({ data }) => { if (data.length) { this.mr.postMergeDeployments = data; 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 2a674042fb4..bf5b85b2ae6 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 @@ -24,7 +24,7 @@ export default class MRWidgetService { fetchDeployments(targetParam) { return axios.get(this.endpoints.ciEnvironmentsStatusPath, { params: { - target: targetParam + environment_target: targetParam } }); } |