summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md14
-rw-r--r--changelogs/unreleased/13-1-stable-ee-update-dependency.yml5
-rw-r--r--changelogs/unreleased/205273-project_auth_periodic_recompute.yml5
-rw-r--r--changelogs/unreleased/223218-re-introduce-ssh-key-comments-via-the-api.yml5
-rw-r--r--changelogs/unreleased/bvl-fix-git-http-user-logging.yml5
-rw-r--r--changelogs/unreleased/fix-templating-variables-set-from-url.yml5
6 files changed, 14 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 196f184f924..94d635c30e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.1.1 (2020-06-23)
+
+### Fixed (4 changes)
+
+- Fix missing templating vars set from URL in metrics dashboard. !34668
+- Fix edit status dropdown overflow. !34847
+- Load user before logging git http-requests. !34923
+- Do not mask key comments for DeployKeys. !35014
+
+### Added (1 change)
+
+- Periodically recompute project authorizations. !34071
+
+
## 13.1.0 (2020-06-22)
### Removed (4 changes, 2 of them are from the community)
diff --git a/changelogs/unreleased/13-1-stable-ee-update-dependency.yml b/changelogs/unreleased/13-1-stable-ee-update-dependency.yml
deleted file mode 100644
index 9fa3607c584..00000000000
--- a/changelogs/unreleased/13-1-stable-ee-update-dependency.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix edit status dropdown overflow
-merge_request: 34847
-author:
-type: fixed
diff --git a/changelogs/unreleased/205273-project_auth_periodic_recompute.yml b/changelogs/unreleased/205273-project_auth_periodic_recompute.yml
deleted file mode 100644
index 2548ad23367..00000000000
--- a/changelogs/unreleased/205273-project_auth_periodic_recompute.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Periodically recompute project authorizations
-merge_request: 34071
-author:
-type: added
diff --git a/changelogs/unreleased/223218-re-introduce-ssh-key-comments-via-the-api.yml b/changelogs/unreleased/223218-re-introduce-ssh-key-comments-via-the-api.yml
deleted file mode 100644
index f173dfc2d47..00000000000
--- a/changelogs/unreleased/223218-re-introduce-ssh-key-comments-via-the-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Do not mask key comments for DeployKeys
-merge_request: 35014
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-fix-git-http-user-logging.yml b/changelogs/unreleased/bvl-fix-git-http-user-logging.yml
deleted file mode 100644
index 70a1194b23d..00000000000
--- a/changelogs/unreleased/bvl-fix-git-http-user-logging.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Load user before logging git http-requests
-merge_request: 34923
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-templating-variables-set-from-url.yml b/changelogs/unreleased/fix-templating-variables-set-from-url.yml
deleted file mode 100644
index d5b1c07f976..00000000000
--- a/changelogs/unreleased/fix-templating-variables-set-from-url.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix missing templating vars set from URL in metrics dashboard
-merge_request: 34668
-author:
-type: fixed