summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-03-12 14:05:29 +0000
committerNick Thomas <nick@gitlab.com>2019-03-12 14:05:29 +0000
commita817f7905c084f725b6fa01955be4fd8ad28c747 (patch)
treea49dda9508222a58572cf42a4b85bd03c71c7bb7
parentbc5576873517013baa4d04492bbc9e99bfa7859e (diff)
parent10066e912949acd66733490b83a34219d7a7eaca (diff)
downloadgitlab-ce-a817f7905c084f725b6fa01955be4fd8ad28c747.tar.gz
Merge branch '58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source-project' into 'master'
Fix UI for closed MR when source project is removed Closes #58797 See merge request gitlab-org/gitlab-ce!25967
-rw-r--r--app/views/projects/merge_requests/_mr_title.html.haml2
-rw-r--r--changelogs/unreleased/58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source-project.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml
index 70011d58c8a..92e34b3ceda 100644
--- a/app/views/projects/merge_requests/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/_mr_title.html.haml
@@ -3,7 +3,7 @@
- if @merge_request.closed_without_fork?
.alert.alert-danger
- %p The source project of this merge request has been removed.
+ The source project of this merge request has been removed.
.detail-page-header
.detail-page-header-body
diff --git a/changelogs/unreleased/58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source-project.yml b/changelogs/unreleased/58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source-project.yml
new file mode 100644
index 00000000000..e30f48ed1a8
--- /dev/null
+++ b/changelogs/unreleased/58797-broken-ui-on-a-closed-merge-request-from-a-deleted-source-project.yml
@@ -0,0 +1,5 @@
+---
+title: Fix UI for closed MR when source project is removed
+merge_request: 25967
+author: Takuya Noguchi
+type: fixed