summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-02 21:07:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-02 21:07:51 +0000
commitd74fcc9b69746c4d9582299c370a95aafe2ac3ac (patch)
tree8230bdf94ff004521422c9986062278dd3bc5b3f /changelogs
parent8a7efa45c38ed3200d173d2c3207a8154e583c16 (diff)
downloadgitlab-ce-d74fcc9b69746c4d9582299c370a95aafe2ac3ac.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml5
-rw-r--r--changelogs/unreleased/rc-use_metric_step.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml b/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml
new file mode 100644
index 00000000000..521fc9f83b7
--- /dev/null
+++ b/changelogs/unreleased/209940-geo-fails-to-sync-file-uploads-with-improper-formatted-path.yml
@@ -0,0 +1,5 @@
+---
+title: Fix incorrect regex used in FileUploader#extract_dynamic_path
+merge_request: 28683
+author:
+type: fixed
diff --git a/changelogs/unreleased/rc-use_metric_step.yml b/changelogs/unreleased/rc-use_metric_step.yml
new file mode 100644
index 00000000000..f697523997c
--- /dev/null
+++ b/changelogs/unreleased/rc-use_metric_step.yml
@@ -0,0 +1,5 @@
+---
+title: Allow defining of metric step in dashboard yml
+merge_request: 28247
+author:
+type: added