GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 71dbd613 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'ce-9826-fix-broken-downstreams' into 'master'

CE port for expanded pipelines

See merge request gitlab-org/gitlab-ce!25859
parents e4b2c3b0 2dbf3da2
...@@ -19,6 +19,7 @@ export default class pipelinesMediator { ...@@ -19,6 +19,7 @@ export default class pipelinesMediator {
this.poll = new Poll({ this.poll = new Poll({
resource: this.service, resource: this.service,
method: 'getPipeline', method: 'getPipeline',
data: this.store.state.expandedPipelines ? this.getExpandedParameters() : undefined,
successCallback: this.successCallback.bind(this), successCallback: this.successCallback.bind(this),
errorCallback: this.errorCallback.bind(this), errorCallback: this.errorCallback.bind(this),
}); });
...@@ -56,6 +57,19 @@ export default class pipelinesMediator { ...@@ -56,6 +57,19 @@ export default class pipelinesMediator {
.getPipeline() .getPipeline()
.then(response => this.successCallback(response)) .then(response => this.successCallback(response))
.catch(() => this.errorCallback()) .catch(() => this.errorCallback())
.finally(() => this.poll.restart()); .finally(() =>
this.poll.restart(
this.store.state.expandedPipelines ? this.getExpandedParameters() : undefined,
),
);
}
/**
* Backend expects paramets in the following format: `expanded[]=id&expanded[]=id`
*/
getExpandedParameters() {
return {
expanded: this.store.state.expandedPipelines,
};
} }
} }
...@@ -5,8 +5,8 @@ export default class PipelineService { ...@@ -5,8 +5,8 @@ export default class PipelineService {
this.pipeline = endpoint; this.pipeline = endpoint;
} }
getPipeline() { getPipeline(params) {
return axios.get(this.pipeline); return axios.get(this.pipeline, { params });
} }
// eslint-disable-next-line class-methods-use-this // eslint-disable-next-line class-methods-use-this
......
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