summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
diff options
context:
space:
mode:
authorSam Bigelow <sbigelow@gitlab.com>2018-12-11 13:27:35 -0500
committerSam Bigelow <sbigelow@gitlab.com>2018-12-14 09:44:54 -0500
commit78f70545ea160a57bf6fc33000076de5e72ab30d (patch)
treef45ee73f60a51b9a1533ec229ab58fa63565631a /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
parent07e079e8dd336e76986ad001fce79ab9babb00b0 (diff)
downloadgitlab-ce-78f70545ea160a57bf6fc33000076de5e72ab30d.tar.gz
Set cached MRWidget SHA after rebase
Update changelog to include Merge Request ID and Author Update changelog to include Merge Request ID and Author
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue8
1 files changed, 6 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 3c3e3efcc36..d8a75388e84 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
@@ -155,13 +155,13 @@ export default {
};
return new MRWidgetService(endpoints);
},
- checkStatus(cb) {
+ checkStatus(cb, isRebased) {
return this.service
.checkStatus()
.then(res => res.data)
.then(data => {
this.handleNotification(data);
- this.mr.setData(data);
+ this.mr.setData(data, isRebased);
this.setFaviconHelper();
if (cb) {
@@ -263,6 +263,10 @@ export default {
this.checkStatus(cb);
});
+ eventHub.$on('MRWidgetRebaseSuccess', cb => {
+ this.checkStatus(cb, true);
+ });
+
// `params` should be an Array contains a Boolean, like `[true]`
// Passing parameter as Boolean didn't work.
eventHub.$on('SetBranchRemoveFlag', params => {