Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-05 20:20:35 +0300
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-07-05 20:20:35 +0300
commit6b1d1b62ffd49ae091de159101c5b22795cdf450 (patch)
treef9feb5c6ac7ebecdd51340b5073b619087ba78d3
parentbc29be45a0aa022bcb7c226874dc04b3eb4e6c16 (diff)
Update CHANGELOG.md for 9.3.5
[ci skip]
-rw-r--r--CHANGELOG.md8
-rw-r--r--changelogs/unreleased/32885-unintentionally-removing-branch-when-merging-merge-request.yml4
-rw-r--r--changelogs/unreleased/34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails.yml4
-rw-r--r--changelogs/unreleased/dm-always-verify-source-branch-can-be-deleted.yml5
-rw-r--r--changelogs/unreleased/fix-2801.yml4
-rw-r--r--changelogs/unreleased/tc-no-delete-protected-merged-branches.yml4
6 files changed, 8 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c0374103a2..d4d3bbd01b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.3.5 (2017-07-05)
+
+- Remove "Remove from board" button from backlog and closed list. !12430
+- Do not delete protected branches when deleting all merged branches. !12624
+- Set default for Remove source branch to false.
+- Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion.
+- Expires full_path cache after a repository is renamed/transferred.
+
## 9.3.4 (2017-07-03)
- No changes.
diff --git a/changelogs/unreleased/32885-unintentionally-removing-branch-when-merging-merge-request.yml b/changelogs/unreleased/32885-unintentionally-removing-branch-when-merging-merge-request.yml
deleted file mode 100644
index 313aeab91b5..00000000000
--- a/changelogs/unreleased/32885-unintentionally-removing-branch-when-merging-merge-request.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Set default for Remove source branch to false.
-merge_request: !12576
-author:
diff --git a/changelogs/unreleased/34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails.yml b/changelogs/unreleased/34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails.yml
deleted file mode 100644
index c0ea75adfa0..00000000000
--- a/changelogs/unreleased/34097-issue-board-remove-from-board-button-when-viewing-an-issue-gives-js-error-and-fails.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Remove "Remove from board" button from backlog and closed list
-merge_request: 12430
-author:
diff --git a/changelogs/unreleased/dm-always-verify-source-branch-can-be-deleted.yml b/changelogs/unreleased/dm-always-verify-source-branch-can-be-deleted.yml
deleted file mode 100644
index f2e1f412502..00000000000
--- a/changelogs/unreleased/dm-always-verify-source-branch-can-be-deleted.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent accidental deletion of protected MR source branch by repeating checks
- before actual deletion
-merge_request:
-author:
diff --git a/changelogs/unreleased/fix-2801.yml b/changelogs/unreleased/fix-2801.yml
deleted file mode 100644
index 4f0aa06b6ba..00000000000
--- a/changelogs/unreleased/fix-2801.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Expires full_path cache after a repository is renamed/transferred
-merge_request:
-author:
diff --git a/changelogs/unreleased/tc-no-delete-protected-merged-branches.yml b/changelogs/unreleased/tc-no-delete-protected-merged-branches.yml
deleted file mode 100644
index 663a0349bac..00000000000
--- a/changelogs/unreleased/tc-no-delete-protected-merged-branches.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Do not delete protected branches when deleting all merged branches
-merge_request: 12624
-author: