summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-03-07 14:05:52 -0500
committerMicaël Bergeron <mbergeron@gitlab.com>2018-03-07 14:05:52 -0500
commita46fde67c53c6919207706c03b26bdcb109cf420 (patch)
tree4f7a0cae2774c7b2ab23fe91b739665da896be4d
parent2bf29a0c81a9adaf464174635159d4e65f30c7a2 (diff)
downloadgitlab-ce-a46fde67c53c6919207706c03b26bdcb109cf420.tar.gz
[ci-skip] add the CE changelog and remove the EE changelogs
-rw-r--r--changelogs/unreleased-ee/39118-dynamic-pipeline-variables-fe.yml6
-rw-r--r--changelogs/unreleased-ee/4163-move-uploads-to-object-storage.yml5
-rw-r--r--changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml5
-rw-r--r--changelogs/unreleased-ee/4915-background-upload-option-is-not-effective.yml5
-rw-r--r--changelogs/unreleased-ee/allow-to-store-artifacts-on-object-storage.yml4
-rw-r--r--changelogs/unreleased-ee/bvl-external-policy-classification.yml5
-rw-r--r--changelogs/unreleased-ee/jej-lfs-object-storage.yml5
-rw-r--r--changelogs/unreleased-ee/use-send-url-for-incompatible-runners.yml6
-rw-r--r--changelogs/unreleased-ee/zj-auto-upload-job-artifacts.yml5
-rw-r--r--changelogs/unreleased-ee/zj-improve-object-store-rake-task.yml5
-rw-r--r--changelogs/unreleased/40781-os-to-ce.yml5
11 files changed, 5 insertions, 51 deletions
diff --git a/changelogs/unreleased-ee/39118-dynamic-pipeline-variables-fe.yml b/changelogs/unreleased-ee/39118-dynamic-pipeline-variables-fe.yml
deleted file mode 100644
index a38b447e345..00000000000
--- a/changelogs/unreleased-ee/39118-dynamic-pipeline-variables-fe.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Update CI/CD secret variables list to be dynamic and save without reloading
- the page
-merge_request: 4110
-author:
-type: added
diff --git a/changelogs/unreleased-ee/4163-move-uploads-to-object-storage.yml b/changelogs/unreleased-ee/4163-move-uploads-to-object-storage.yml
deleted file mode 100644
index 18910f0d97b..00000000000
--- a/changelogs/unreleased-ee/4163-move-uploads-to-object-storage.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add object storage support for uploads.
-merge_request: 3867
-author:
-type: added
diff --git a/changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml b/changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml
deleted file mode 100644
index bbb6cbd05be..00000000000
--- a/changelogs/unreleased-ee/4378-fix-cluster-js-not-running-on-update-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix JavaScript bundle running on Cluster update/destroy pages
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased-ee/4915-background-upload-option-is-not-effective.yml b/changelogs/unreleased-ee/4915-background-upload-option-is-not-effective.yml
deleted file mode 100644
index 54ae83f8d76..00000000000
--- a/changelogs/unreleased-ee/4915-background-upload-option-is-not-effective.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix the background_upload configuration being ignored.
-merge_request: 4507
-author:
-type: fixed
diff --git a/changelogs/unreleased-ee/allow-to-store-artifacts-on-object-storage.yml b/changelogs/unreleased-ee/allow-to-store-artifacts-on-object-storage.yml
deleted file mode 100644
index 3f1499a3ffe..00000000000
--- a/changelogs/unreleased-ee/allow-to-store-artifacts-on-object-storage.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Allow to Store Artifacts on Object Storage
-merge_request:
-author:
diff --git a/changelogs/unreleased-ee/bvl-external-policy-classification.yml b/changelogs/unreleased-ee/bvl-external-policy-classification.yml
deleted file mode 100644
index 074629c8c12..00000000000
--- a/changelogs/unreleased-ee/bvl-external-policy-classification.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Authorize project access with an external service
-merge_request: 4675
-author:
-type: added
diff --git a/changelogs/unreleased-ee/jej-lfs-object-storage.yml b/changelogs/unreleased-ee/jej-lfs-object-storage.yml
deleted file mode 100644
index c7a6388afb1..00000000000
--- a/changelogs/unreleased-ee/jej-lfs-object-storage.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: LFS files can be stored in remote object storage such as S3
-merge_request: 2760
-author:
-type: added
diff --git a/changelogs/unreleased-ee/use-send-url-for-incompatible-runners.yml b/changelogs/unreleased-ee/use-send-url-for-incompatible-runners.yml
deleted file mode 100644
index 6e924a9ee0b..00000000000
--- a/changelogs/unreleased-ee/use-send-url-for-incompatible-runners.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Support SendURL for performing indirect download of artifacts if clients does
- not specify that it supports that
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased-ee/zj-auto-upload-job-artifacts.yml b/changelogs/unreleased-ee/zj-auto-upload-job-artifacts.yml
deleted file mode 100644
index 4335f85e360..00000000000
--- a/changelogs/unreleased-ee/zj-auto-upload-job-artifacts.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Transfer job archives to object storage after creation
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased-ee/zj-improve-object-store-rake-task.yml b/changelogs/unreleased-ee/zj-improve-object-store-rake-task.yml
deleted file mode 100644
index 70ffaa45bfd..00000000000
--- a/changelogs/unreleased-ee/zj-improve-object-store-rake-task.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use a logger for the artifacts migration rake task
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/40781-os-to-ce.yml b/changelogs/unreleased/40781-os-to-ce.yml
new file mode 100644
index 00000000000..4a364292c60
--- /dev/null
+++ b/changelogs/unreleased/40781-os-to-ce.yml
@@ -0,0 +1,5 @@
+---
+title: Add object storage support for LFS objects, CI artifacts, and uploads.
+merge_request: 17358
+author:
+type: added