diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 4ba48aa4339f144bd28be55b44a48c93d47364d0..5e3f82fe9ceffdc29bc6fd96569a692f8d95cbdc 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -36,7 +36,7 @@ module MergeRequestsHelper def merge_path_description(merge_request, separator) if merge_request.for_fork? - "Project:Branches: #{@merge_request.source_project.path_with_namespace}:#{@merge_request.source_branch} #{separator} #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch}" + "Project:Branches: #{@merge_request.source_project_path}:#{@merge_request.source_branch} #{separator} #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch}" else "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" end diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index c78be4965d0337044fef01507dcd21062aa2b771..abb8a5a378763197054db0dc696658eec16cd39c 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -10,7 +10,7 @@ .span5 .clearfix .pull-left - = f.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span3'}) + = f.select(:source_project_id,[[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span3'}) .pull-left   = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span2'}) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 933d78bcbfbd5e12fe3b70e6e85470130d7017e5..faa67e1aeb0fbd60579b530acd5b293b981da439 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -10,7 +10,7 @@ %span.pull-right - if merge_request.for_fork? %span.light - = "#{merge_request.source_project.path_with_namespace}" + = "#{merge_request.source_project_path}" = "#{merge_request.source_branch}" %i.icon-angle-right.light = "#{merge_request.target_branch}" diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml index 030ac285f2a9e5f73afc117720e956232452631b..98d373e8ad41731ced9a348e39f7b5e6530b46d0 100644 --- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml +++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml @@ -10,7 +10,7 @@ %strong Step 1. Checkout target branch and get recent objects from GitLab Assuming remote for #{@merge_request.target_project.path_with_namespace} is called #{target_remote} - remote for #{@merge_request.source_project.path_with_namespace} is called #{source_remote} + remote for #{@merge_request.source_project_path} is called #{source_remote} %pre.dark :preserve git checkout #{target_remote} #{@merge_request.target_branch} diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 096a91676455682750feb3d7984fadf7ff28ff44..8913dfad11c0039e0b52e33e96a36a613ea16c9b 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -3,7 +3,7 @@   -if @merge_request.for_fork? %span.label-branch - %span.label-project= truncate(@merge_request.source_project.path_with_namespace, length: 25) + %span.label-project= truncate(@merge_request.source_project_path, length: 25) #{@merge_request.source_branch} → %span.label-branch= @merge_request.target_branch