Commit 280b6f6f authored by Phil Hughes's avatar Phil Hughes

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
parents cf40530e 1b929072
...@@ -142,8 +142,8 @@ export default { ...@@ -142,8 +142,8 @@ export default {
} }
}, },
methods: { methods: {
createService(store) { getServiceEndpoints(store) {
const endpoints = { return {
mergePath: store.mergePath, mergePath: store.mergePath,
mergeCheckPath: store.mergeCheckPath, mergeCheckPath: store.mergeCheckPath,
cancelAutoMergePath: store.cancelAutoMergePath, cancelAutoMergePath: store.cancelAutoMergePath,
...@@ -154,7 +154,9 @@ export default { ...@@ -154,7 +154,9 @@ export default {
mergeActionsContentPath: store.mergeActionsContentPath, mergeActionsContentPath: store.mergeActionsContentPath,
rebasePath: store.rebasePath, rebasePath: store.rebasePath,
}; };
return new MRWidgetService(endpoints); },
createService(store) {
return new MRWidgetService(this.getServiceEndpoints(store));
}, },
checkStatus(cb, isRebased) { checkStatus(cb, isRebased) {
return this.service return this.service
......
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