diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2017-07-20 12:34:09 +0300 |
|---|---|---|
| committer | Gabriel Mazetto <brodock@gmail.com> | 2017-08-01 08:26:58 +0300 |
| commit | abb878326c5cac283fff19716149211658ce25d1 (patch) | |
| tree | dde4804c2b877f3cf713cb405d0e2e336f9bdbf2 /app/helpers | |
| parent | 98615318883e37a4c9cb201e3e65bb7b775112cd (diff) | |
Rename many path_with_namespace -> full_path
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 78cf7b26a31..c31023f2d9a 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -40,7 +40,7 @@ module MergeRequestsHelper def merge_path_description(merge_request, separator) if merge_request.for_fork? - "Project:Branches: #{@merge_request.source_project_path}:#{@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.full_path}:#{@merge_request.target_branch}" else "Branches: #{@merge_request.source_branch} #{separator} #{@merge_request.target_branch}" end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 9a8d296d514..34ff6107eab 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -398,7 +398,7 @@ module ProjectsHelper if project import_path = "/Home/Stacks/import" - repo = project.path_with_namespace + repo = project.full_path branch ||= project.default_branch sha ||= project.commit.short_id @@ -458,7 +458,7 @@ module ProjectsHelper def readme_cache_key sha = @project.commit.try(:sha) || 'nil' - [@project.path_with_namespace, sha, "readme"].join('-') + [@project.full_path, sha, "readme"].join('-') end def current_ref |