summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-08-30 17:43:15 +0000
committerDouwe Maan <douwe@gitlab.com>2016-08-30 17:43:15 +0000
commit4bbe5ce622eafc886c3c6732bb5e7b39d1d7a351 (patch)
tree26140eea3f8060f8cf6a2a15a71ae4aa8a6ab802 /CHANGELOG
parentf81e527677ae74373ae2f00c37a84120d4e40dd9 (diff)
parent2d8d94a788eb0bf3885ee67bda9638556425fa4b (diff)
downloadgitlab-ce-4bbe5ce622eafc886c3c6732bb5e7b39d1d7a351.tar.gz
Merge branch '19315-can-edit-merge-request-with-deleted-fork' into 'master'
User can edit closed MR with deleted fork ## What does this MR do? User can edit closed MR with deleted fork (can't change "Target branch"). When fork is deleted "Reopen" button is hidden. ## What are the relevant issue numbers? Closes #19315 ## Screenshots (if relevant) * hidden Reopen button and information about deleted fork ![Zrzut_ekranu_2016-08-12_o_13.19.24](/uploads/d288c5625e788382e31b2979acb601df/Zrzut_ekranu_2016-08-12_o_13.19.24.png) * editable fields for closed MR without fork ![Zrzut_ekranu_2016-08-05_o_12.24.38](/uploads/1549e54d4bc2a9939ef296ce66139706/Zrzut_ekranu_2016-08-05_o_12.24.38.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin See merge request !5496
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 76f05d9123e..c7559c17605 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.12.0 (unreleased)
- Use the default branch for displaying the project icon instead of master !5792 (Hannes Rosenögger)
- Adds response mime type to transaction metric action when it's not HTML
- Fix hover leading space bug in pipeline graph !5980
+ - User can edit closed MR with deleted fork (Katarzyna Kobierska Ula Budziszewska) !5496
v 8.11.4 (unreleased)
- Fix broken gitlab:backup:restore because of bad permissions on repo storage !6098 (Dirk Hörner)