summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-10 18:09:32 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-10 18:09:32 +0000
commited5add1c2f001c9bd54e664b32f212de172eca6a (patch)
treef9449cbecde36706f25a62f426b5398566ae5cca /changelogs
parentde2fb5b82c92c90f90ed67ced45143c04e934fb8 (diff)
downloadgitlab-ce-ed5add1c2f001c9bd54e664b32f212de172eca6a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/204908-ensure-correct-prometheus-alert-found.yml5
-rw-r--r--changelogs/unreleased/georgekoltsov-remove_trial_ends_on_from_group_export.yml5
-rw-r--r--changelogs/unreleased/mwaw-211330-add-metrics-dashboard-graphql-resource.yml5
3 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/204908-ensure-correct-prometheus-alert-found.yml b/changelogs/unreleased/204908-ensure-correct-prometheus-alert-found.yml
new file mode 100644
index 00000000000..35f48fd884b
--- /dev/null
+++ b/changelogs/unreleased/204908-ensure-correct-prometheus-alert-found.yml
@@ -0,0 +1,5 @@
+---
+title: Prevent wrong environment being used when processing Prometheus alert
+merge_request: 29119
+author:
+type: fixed
diff --git a/changelogs/unreleased/georgekoltsov-remove_trial_ends_on_from_group_export.yml b/changelogs/unreleased/georgekoltsov-remove_trial_ends_on_from_group_export.yml
new file mode 100644
index 00000000000..ff61cf92cc9
--- /dev/null
+++ b/changelogs/unreleased/georgekoltsov-remove_trial_ends_on_from_group_export.yml
@@ -0,0 +1,5 @@
+---
+title: Exclude 'trial_ends_on', 'shared_runners_minutes_limit' & 'extra_shared_runners_minutes_limit' from list of exported Group attributes
+merge_request: 29259
+author:
+type: fixed
diff --git a/changelogs/unreleased/mwaw-211330-add-metrics-dashboard-graphql-resource.yml b/changelogs/unreleased/mwaw-211330-add-metrics-dashboard-graphql-resource.yml
new file mode 100644
index 00000000000..ab4801c4a48
--- /dev/null
+++ b/changelogs/unreleased/mwaw-211330-add-metrics-dashboard-graphql-resource.yml
@@ -0,0 +1,5 @@
+---
+title: Add graphQL interface to fetch metrics dashboard
+merge_request: 29112
+author:
+type: added