Commit 9537fe90 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 0d382623 3300143b
...@@ -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
......
---
title: Use curl silent/show-error options on Auto DevOps
merge_request: 25954
author: Takuya Noguchi
type: other
...@@ -780,18 +780,18 @@ rollout 100%: ...@@ -780,18 +780,18 @@ rollout 100%:
function install_dependencies() { function install_dependencies() {
apk add -U openssl curl tar gzip bash ca-certificates git apk add -U openssl curl tar gzip bash ca-certificates git
curl -L -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub curl -sSL -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
curl -L -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk curl -sSL -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk
apk add glibc-2.28-r0.apk apk add glibc-2.28-r0.apk
rm glibc-2.28-r0.apk rm glibc-2.28-r0.apk
curl "https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx curl -sS "https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx
mv linux-amd64/helm /usr/bin/ mv linux-amd64/helm /usr/bin/
mv linux-amd64/tiller /usr/bin/ mv linux-amd64/tiller /usr/bin/
helm version --client helm version --client
tiller -version tiller -version
curl -L -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl" curl -sSL -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl"
chmod +x /usr/bin/kubectl chmod +x /usr/bin/kubectl
kubectl version --client kubectl version --client
} }
......
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