diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-29 12:06:35 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-05 11:11:59 -0500 |
| commit | fe13f110412d85c05dc68e5ee1db499f681bf722 (patch) | |
| tree | 4a2d172bb5a490ac8cadbcf376fbf815393ef22b /lib/gitlab/conflict/file.rb | |
| parent | dc7939337e0d72d2391c3bbb3082d644a54195af (diff) | |
| download | gitlab-ce-fe13f110412d85c05dc68e5ee1db499f681bf722.tar.gz | |
Create and use project path helpers that only need a project, no namespace
Diffstat (limited to 'lib/gitlab/conflict/file.rb')
| -rw-r--r-- | lib/gitlab/conflict/file.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 75a213ef752..d2b4e6e209e 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -205,9 +205,7 @@ module Gitlab old_path: their_path, new_path: our_path, blob_icon: file_type_icon_class('file', our_mode, our_path), - blob_path: namespace_project_blob_path(merge_request.project.namespace, - merge_request.project, - ::File.join(merge_request.diff_refs.head_sha, our_path)) + blob_path: project_blob_path(merge_request.project, ::File.join(merge_request.diff_refs.head_sha, our_path)) } json_hash.tap do |json_hash| @@ -223,11 +221,10 @@ module Gitlab end def content_path - conflict_for_path_namespace_project_merge_request_path(merge_request.project.namespace, - merge_request.project, - merge_request, - old_path: their_path, - new_path: our_path) + conflict_for_path_project_merge_request_path(merge_request.project, + merge_request, + old_path: their_path, + new_path: our_path) end # Don't try to print merge_request or repository. |