summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-26 17:34:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-26 17:34:57 +0000
commitb2ce3643e27db4cc0ad30cc09d651c00ec799887 (patch)
treef0e7882be8145da2f59fec4ac26e070afd147ab9 /changelogs
parente9143b15cc400b69ef274789225ac2fee5fdcf83 (diff)
downloadgitlab-ce-b2ce3643e27db4cc0ad30cc09d651c00ec799887.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/mimemagic_shim.yml5
-rw-r--r--changelogs/unreleased/remove-direct-mimemagic-dependency-minimal.yml5
-rw-r--r--changelogs/unreleased/remove-direct-mimemagic-dependency.yml5
-rw-r--r--changelogs/unreleased/remove_hipchat_gem.yml5
4 files changed, 20 insertions, 0 deletions
diff --git a/changelogs/unreleased/mimemagic_shim.yml b/changelogs/unreleased/mimemagic_shim.yml
new file mode 100644
index 00000000000..0376122f0ce
--- /dev/null
+++ b/changelogs/unreleased/mimemagic_shim.yml
@@ -0,0 +1,5 @@
+---
+title: Switch to using a fake mimemagic gem
+merge_request: 57443
+author:
+type: other
diff --git a/changelogs/unreleased/remove-direct-mimemagic-dependency-minimal.yml b/changelogs/unreleased/remove-direct-mimemagic-dependency-minimal.yml
new file mode 100644
index 00000000000..727887f7e7b
--- /dev/null
+++ b/changelogs/unreleased/remove-direct-mimemagic-dependency-minimal.yml
@@ -0,0 +1,5 @@
+---
+title: Refactor MimeMagic calls to new MimeType class
+merge_request: 57421
+author:
+type: other
diff --git a/changelogs/unreleased/remove-direct-mimemagic-dependency.yml b/changelogs/unreleased/remove-direct-mimemagic-dependency.yml
new file mode 100644
index 00000000000..5194dfdf751
--- /dev/null
+++ b/changelogs/unreleased/remove-direct-mimemagic-dependency.yml
@@ -0,0 +1,5 @@
+---
+title: Remove direct mimemagic dependency
+merge_request: 57387
+author:
+type: other
diff --git a/changelogs/unreleased/remove_hipchat_gem.yml b/changelogs/unreleased/remove_hipchat_gem.yml
new file mode 100644
index 00000000000..21a5db3bb5a
--- /dev/null
+++ b/changelogs/unreleased/remove_hipchat_gem.yml
@@ -0,0 +1,5 @@
+---
+title: Make HipChat project service do nothing
+merge_request: 57434
+author:
+type: removed