summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md16
-rw-r--r--changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml5
-rw-r--r--changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml5
-rw-r--r--changelogs/unreleased/revert-a6875e5f.yml5
-rw-r--r--changelogs/unreleased/unleash-api-with-private-repo.yml5
5 files changed, 16 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19075b42f0a..a3d165653c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.4.1 (2020-09-24)
+
+### Fixed (2 changes)
+
+- Revert required encryption on CI runner tokens. !42623
+- Allow Unleash clients to request feature flags when repository is private. !43059
+
+### Added (1 change)
+
+- Add missing fontawesome file icon classes. !43091
+
+### Other (1 change)
+
+- Notifications icon: Render empty string for custom setting. !42848
+
+
## 13.4.0 (2020-09-22)
### Security (2 changes, 1 of them is from the community)
diff --git a/changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml b/changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml
deleted file mode 100644
index 1250aa860dc..00000000000
--- a/changelogs/unreleased/254224-notification-icons-missing-icon-for-custom.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Notifications icon: Render empty string for custom setting'
-merge_request: 42848
-author:
-type: other
diff --git a/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml b/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml
deleted file mode 100644
index 8ad7010c0ee..00000000000
--- a/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add missing fontawesome file icon classes
-merge_request: 43091
-author:
-type: added
diff --git a/changelogs/unreleased/revert-a6875e5f.yml b/changelogs/unreleased/revert-a6875e5f.yml
deleted file mode 100644
index ea8135346f2..00000000000
--- a/changelogs/unreleased/revert-a6875e5f.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Revert required encryption on CI runner tokens
-merge_request: 42623
-author:
-type: fixed
diff --git a/changelogs/unreleased/unleash-api-with-private-repo.yml b/changelogs/unreleased/unleash-api-with-private-repo.yml
deleted file mode 100644
index 3dcdfcdd899..00000000000
--- a/changelogs/unreleased/unleash-api-with-private-repo.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow Unleash clients to request feature flags when repository is private
-merge_request: 43059
-author:
-type: fixed