diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 09:09:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-11 09:09:46 +0300 |
commit | 55733b19c526145cceb120e8bb874d476a84383a (patch) | |
tree | dcde3cfb905516cd1f07ab364a94aff5fddff391 /changelogs | |
parent | ea99abb145ed193c2ac5d19efbff3b8990a54c9c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/fix_prometheus_configured_blocked.yml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/port-trigger-keyword-to-ce.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix_prometheus_configured_blocked.yml b/changelogs/unreleased/fix_prometheus_configured_blocked.yml new file mode 100644 index 00000000000..5676c41ffd3 --- /dev/null +++ b/changelogs/unreleased/fix_prometheus_configured_blocked.yml @@ -0,0 +1,5 @@ +--- +title: Fix job page not loading because kuberenetes/prometheus URL is blocked +merge_request: 24743 +author: +type: fixed diff --git a/changelogs/unreleased/port-trigger-keyword-to-ce.yml b/changelogs/unreleased/port-trigger-keyword-to-ce.yml new file mode 100644 index 00000000000..d518bd03021 --- /dev/null +++ b/changelogs/unreleased/port-trigger-keyword-to-ce.yml @@ -0,0 +1,5 @@ +--- +title: Port `trigger` keyword in CI config to Core +merge_request: 24191 +author: +type: fixed |