Commit a7cb4460 authored by Stan Hu's avatar Stan Hu

Fix bad merge causing duplicate methods in...

Fix bad merge causing duplicate methods in app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
parent ed02f0cb
......@@ -113,12 +113,6 @@ export default {
beforeDestroy() {
eventHub.$off('MRWidgetUpdateSquash', this.handleUpdateSquash);
},
created() {
eventHub.$on('MRWidgetUpdateSquash', this.handleUpdateSquash);
},
beforeDestroy() {
eventHub.$off('MRWidgetUpdateSquash', this.handleUpdateSquash);
},
methods: {
shouldShowMergeControls() {
return this.mr.isMergeAllowed || this.shouldShowMergeWhenPipelineSucceedsText;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment