diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-10-19 19:13:04 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2016-10-20 14:24:27 +0300 |
| commit | 374071321d0cfb7a161ec38e85e27e1d46ae7c9a (patch) | |
| tree | 4fd27bd59afc80546d09190e2245284942e080bd /app/helpers | |
| parent | e6f515ecbed85b204e8f7bc9934b0bf208a0ea4c (diff) | |
Fix the merge request view when source projects or branches are removed
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 249cb44e9d5..a6659ea2fd1 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -86,11 +86,15 @@ module MergeRequestsHelper end def source_branch_with_namespace(merge_request) - branch = link_to(merge_request.source_branch, namespace_project_commits_path(merge_request.source_project.namespace, merge_request.source_project, merge_request.source_branch)) + namespace = merge_request.source_project_namespace + branch = merge_request.source_branch + + if merge_request.source_branch_exists? + namespace = link_to(namespace, project_path(merge_request.source_project)) + branch = link_to(branch, namespace_project_commits_path(merge_request.source_project.namespace, merge_request.source_project, merge_request.source_branch)) + end if merge_request.for_fork? - namespace = link_to(merge_request.source_project_namespace, - project_path(merge_request.source_project)) namespace + ":" + branch else branch |