diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-08 06:08:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-08 06:08:13 +0000 |
| commit | f6e985dba4d0f5b1ede95e9174d30dd6a8bedf0d (patch) | |
| tree | c1fed91ae38ad6150ba323a2fc9a68f50f648bb4 /changelogs | |
| parent | 30010b161d42bdac3ab5cd16e63cc61c2f4939f3 (diff) | |
| download | gitlab-ce-f6e985dba4d0f5b1ede95e9174d30dd6a8bedf0d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/revert-knative-version-prerequisite.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-unique-ips-limiter.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/revert-knative-version-prerequisite.yml b/changelogs/unreleased/revert-knative-version-prerequisite.yml new file mode 100644 index 00000000000..bc0bb1e25f3 --- /dev/null +++ b/changelogs/unreleased/revert-knative-version-prerequisite.yml @@ -0,0 +1,5 @@ +--- +title: Reverts Add RBAC permissions for getting knative version +merge_request: 22560 +author: +type: fixed diff --git a/changelogs/unreleased/sh-fix-unique-ips-limiter.yml b/changelogs/unreleased/sh-fix-unique-ips-limiter.yml new file mode 100644 index 00000000000..d124137e768 --- /dev/null +++ b/changelogs/unreleased/sh-fix-unique-ips-limiter.yml @@ -0,0 +1,5 @@ +--- +title: Fix deploy tokens erroneously triggering unique IP limits +merge_request: 22445 +author: +type: fixed |