Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9537fe90
Commit
9537fe90
authored
Mar 12, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
0d382623
3300143b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
7 deletions
+26
-7
app/assets/javascripts/pipelines/pipeline_details_mediator.js
...assets/javascripts/pipelines/pipeline_details_mediator.js
+15
-1
app/assets/javascripts/pipelines/services/pipeline_service.js
...assets/javascripts/pipelines/services/pipeline_service.js
+2
-2
changelogs/unreleased/58781-silent-progress-in-auto-devops.yml
...elogs/unreleased/58781-silent-progress-in-auto-devops.yml
+5
-0
lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+4
-4
No files found.
app/assets/javascripts/pipelines/pipeline_details_mediator.js
View file @
9537fe90
...
...
@@ -19,6 +19,7 @@ export default class pipelinesMediator {
this
.
poll
=
new
Poll
({
resource
:
this
.
service
,
method
:
'
getPipeline
'
,
data
:
this
.
store
.
state
.
expandedPipelines
?
this
.
getExpandedParameters
()
:
undefined
,
successCallback
:
this
.
successCallback
.
bind
(
this
),
errorCallback
:
this
.
errorCallback
.
bind
(
this
),
});
...
...
@@ -56,6 +57,19 @@ export default class pipelinesMediator {
.
getPipeline
()
.
then
(
response
=>
this
.
successCallback
(
response
))
.
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
,
};
}
}
app/assets/javascripts/pipelines/services/pipeline_service.js
View file @
9537fe90
...
...
@@ -5,8 +5,8 @@ export default class PipelineService {
this
.
pipeline
=
endpoint
;
}
getPipeline
()
{
return
axios
.
get
(
this
.
pipeline
);
getPipeline
(
params
)
{
return
axios
.
get
(
this
.
pipeline
,
{
params
}
);
}
// eslint-disable-next-line class-methods-use-this
...
...
changelogs/unreleased/58781-silent-progress-in-auto-devops.yml
0 → 100644
View file @
9537fe90
---
title
:
Use curl silent/show-error options on Auto DevOps
merge_request
:
25954
author
:
Takuya Noguchi
type
:
other
lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
View file @
9537fe90
...
...
@@ -780,18 +780,18 @@ rollout 100%:
function install_dependencies() {
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 -L -O https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk
curl -
sS
L -o /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
curl -
sS
L -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
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/tiller /usr/bin/
helm version --client
tiller -version
curl -L -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl"
curl -
sS
L -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl"
chmod +x /usr/bin/kubectl
kubectl version --client
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment