summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-11 00:08:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-11 00:08:28 +0000
commit7873bb3c1a2870761c243ea4ebe96f249ad5a319 (patch)
tree89ddef4a2e4b9cb47d41f6ff8ff68bda8777c938 /changelogs
parent667f6fbc8df6c23f69bc6adba15204f8559bcc3a (diff)
downloadgitlab-ce-7873bb3c1a2870761c243ea4ebe96f249ad5a319.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/remove-feature-flag-import-graceful-failures.yml5
-rw-r--r--changelogs/unreleased/sh-fix-sidekiq-timestamps.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/remove-feature-flag-import-graceful-failures.yml b/changelogs/unreleased/remove-feature-flag-import-graceful-failures.yml
new file mode 100644
index 00000000000..df6d4429e42
--- /dev/null
+++ b/changelogs/unreleased/remove-feature-flag-import-graceful-failures.yml
@@ -0,0 +1,5 @@
+---
+title: Remove feature flag for import graceful failures
+merge_request:
+author:
+type: other
diff --git a/changelogs/unreleased/sh-fix-sidekiq-timestamps.yml b/changelogs/unreleased/sh-fix-sidekiq-timestamps.yml
new file mode 100644
index 00000000000..7da759c4bca
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-sidekiq-timestamps.yml
@@ -0,0 +1,5 @@
+---
+title: Make Sidekiq timestamps consistently ISO 8601
+merge_request: 22750
+author:
+type: fixed