kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ce-mr-widget-service-endpoints-method' into 'master' 

CE Port of "Extract extension method from mr_widget_options"

See merge request gitlab-org/gitlab-ce!24891
This commit is contained in:
Phil Hughes 2019-02-04 15:35:16 +00:00
parent cf40530e66 1b929072f9
commit 280b6f6f8d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View File

@ -142,8 +142,8 @@ export default {
}
},
methods: {
createService(store) {
const endpoints = {
getServiceEndpoints(store) {
return {
mergePath: store.mergePath,
mergeCheckPath: store.mergeCheckPath,
cancelAutoMergePath: store.cancelAutoMergePath,
@ -154,7 +154,9 @@ export default {
mergeActionsContentPath: store.mergeActionsContentPath,
rebasePath: store.rebasePath,
};
return new MRWidgetService(endpoints);
},
createService(store) {
return new MRWidgetService(this.getServiceEndpoints(store));
},
checkStatus(cb, isRebased) {
return this.service