diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-21 20:22:55 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-21 20:22:55 +0000 |
commit | 3c8d2148fc81cf75af322744221a0ff284216988 (patch) | |
tree | e9bc950f5b5c8b2515fd1ce52abb2e92662e272f /changelogs | |
parent | 3e3b2fab28af3412032be05252ae7868610346b2 (diff) | |
parent | 461195665b22291d5e57287efc0567b89a9ee262 (diff) | |
download | gitlab-ce-3c8d2148fc81cf75af322744221a0ff284216988.tar.gz |
Merge branch 'feature/send-registry-address-with-build-payload' into 'master'
Send registry address with build payload
## What does this MR do?
Adds `registry_url` as a part of a build payload, when sending a response to a GitLab Runner which requested a new build.
## Are there points in the code the reviewer needs to double check?
Change in `lib/ci/api/entities.rb`.
## Why was this MR needed?
This is one of the steps needed to add support for private/protected registries hosted with GitLab CE/EE.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Related to gitlab-org/gitlab-ci-multi-runner#1828, gitlab-org/gitlab-ci-multi-runner!386, gitlab-org/gitlab-ci-multi-runner#1434
See merge request !7474
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/feature-send-registry-address-with-build-payload.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/feature-send-registry-address-with-build-payload.yml b/changelogs/unreleased/feature-send-registry-address-with-build-payload.yml new file mode 100644 index 00000000000..db9bb2bc31f --- /dev/null +++ b/changelogs/unreleased/feature-send-registry-address-with-build-payload.yml @@ -0,0 +1,4 @@ +--- +title: Send credentials (currently for registry only) with build data to GitLab Runner +merge_request: 7474 +author: |