diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 00:09:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 00:09:20 +0000 |
| commit | 88797b994a7dfd9bfab2a5d5431f088f17078b9f (patch) | |
| tree | e9556b7dd50b980bf21c8ea816cec3282e723e15 | |
| parent | bcd53ecb5132426c9c33116efd846a5c8c6c2945 (diff) | |
| download | gitlab-ce-88797b994a7dfd9bfab2a5d5431f088f17078b9f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/models/clusters/applications/crossplane.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/use-default-crossplane-stack-versions.yml | 5 | ||||
| -rw-r--r-- | doc/api/pipelines.md | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/models/clusters/applications/crossplane.rb b/app/models/clusters/applications/crossplane.rb index 36246b26066..420e56c1742 100644 --- a/app/models/clusters/applications/crossplane.rb +++ b/app/models/clusters/applications/crossplane.rb @@ -49,8 +49,7 @@ module Clusters { "clusterStacks" => { self.stack => { - "deploy" => true, - "version" => "alpha" + "deploy" => true } } } diff --git a/changelogs/unreleased/use-default-crossplane-stack-versions.yml b/changelogs/unreleased/use-default-crossplane-stack-versions.yml new file mode 100644 index 00000000000..b65c27e637b --- /dev/null +++ b/changelogs/unreleased/use-default-crossplane-stack-versions.yml @@ -0,0 +1,5 @@ +--- +title: Fix installation of GitLab-managed crossplane chart +merge_request: 27040 +author: +type: fixed diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md index 67d9348ba92..55894a36147 100644 --- a/doc/api/pipelines.md +++ b/doc/api/pipelines.md @@ -12,7 +12,7 @@ GET /projects/:id/pipelines |-----------|---------|----------|---------------------| | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | | `scope` | string | no | The scope of pipelines, one of: `running`, `pending`, `finished`, `branches`, `tags` | -| `status` | string | no | The status of pipelines, one of: `running`, `pending`, `success`, `failed`, `canceled`, `skipped` | +| `status` | string | no | The status of pipelines, one of: `running`, `pending`, `success`, `failed`, `canceled`, `skipped`, `created` | | `ref` | string | no | The ref of pipelines | | `sha` | string | no | The sha of pipelines | | `yaml_errors`| boolean | no | Returns pipelines with invalid configurations | |