Download as
Browse Code »

Commit 432018f84beb96a8f6eb791af59e175263ea01aa

Authored by Dmitriy Zaporozhets
1 parent 7901d143
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Use MR#source_project_path method instead of merge_request.source_project.path_with_namespace 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 5 changed files with 5 additions and 5 deletions   Show diff stats
app/helpers/merge_requests_helper.rb
  Diff comments   View file @432018f
@@ -36,7 +36,7 @@ module MergeRequestsHelper @@ -36,7 +36,7 @@ module MergeRequestsHelper
36 36
37 def merge_path_description(merge_request, separator) 37 def merge_path_description(merge_request, separator)
38 if merge_request.for_fork? 38 if merge_request.for_fork?
39 - "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}" 39 + "Project:Branches: #{@merge_request.source_project_path}:#{@merge_request.source_branch} #{separator} #{@merge_request.target_project.path_with_namespace}:#{@merge_request.target_branch}"
40 else 40 else
41 "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" 41 "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}"
42 end 42 end
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @432018f
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 .span5 10 .span5
11 .clearfix 11 .clearfix
12 .pull-left 12 .pull-left
13 - = f.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span3'}) 13 + = f.select(:source_project_id,[[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span3'})
14 .pull-left 14 .pull-left
15 &nbsp; 15 &nbsp;
16 = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span2'}) 16 = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span2'})
app/views/projects/merge_requests/_merge_request.html.haml
  Diff comments   View file @432018f
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %span.pull-right 10 %span.pull-right
11 - if merge_request.for_fork? 11 - if merge_request.for_fork?
12 %span.light 12 %span.light
13 - = "#{merge_request.source_project.path_with_namespace}" 13 + = "#{merge_request.source_project_path}"
14 = "#{merge_request.source_branch}" 14 = "#{merge_request.source_branch}"
15 %i.icon-angle-right.light 15 %i.icon-angle-right.light
16 = "#{merge_request.target_branch}" 16 = "#{merge_request.target_branch}"
app/views/projects/merge_requests/show/_how_to_merge.html.haml
  Diff comments   View file @432018f
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %strong Step 1. 10 %strong Step 1.
11 Checkout target branch and get recent objects from GitLab 11 Checkout target branch and get recent objects from GitLab
12 Assuming remote for #{@merge_request.target_project.path_with_namespace} is called #{target_remote} 12 Assuming remote for #{@merge_request.target_project.path_with_namespace} is called #{target_remote}
13 - remote for #{@merge_request.source_project.path_with_namespace} is called #{source_remote} 13 + remote for #{@merge_request.source_project_path} is called #{source_remote}
14 %pre.dark 14 %pre.dark
15 :preserve 15 :preserve
16 git checkout #{target_remote} #{@merge_request.target_branch} 16 git checkout #{target_remote} #{@merge_request.target_branch}
app/views/projects/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @432018f
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 &nbsp; 3 &nbsp;
4 -if @merge_request.for_fork? 4 -if @merge_request.for_fork?
5 %span.label-branch 5 %span.label-branch
6 - %span.label-project= truncate(@merge_request.source_project.path_with_namespace, length: 25) 6 + %span.label-project= truncate(@merge_request.source_project_path, length: 25)
7 #{@merge_request.source_branch} 7 #{@merge_request.source_branch}
8 &rarr; 8 &rarr;
9 %span.label-branch= @merge_request.target_branch 9 %span.label-branch= @merge_request.target_branch