diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-05-18 16:23:05 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-05-19 09:13:27 -0700 |
| commit | 49697bc8df613dfe8e88f5f7cd8eae57e26c786f (patch) | |
| tree | da5888be64878d8b35d1727dc802d609960fd631 /app/controllers/projects_controller.rb | |
| parent | f9785dcec34c4205732871523f95b9743db00965 (diff) | |
| download | gitlab-ce-49697bc8df613dfe8e88f5f7cd8eae57e26c786f.tar.gz | |
Refactor to more robust implementationfix-issue-32506
In order to avoid string manipulation or modify route params (to make them unambiguous for `url_for`), we are accepting a behavior change:
When being redirected to the canonical path for a group, if you requested a group show path starting with `/groups/…` then you’ll now be redirected to the group at root `/…`.
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 63d018c8cbf..544715d62ea 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -365,4 +365,11 @@ class ProjectsController < Projects::ApplicationController def project_view_files_allowed? !project.empty_repo? && can?(current_user, :download_code, project) end + + def build_canonical_path(project) + params[:namespace_id] = project.namespace.to_param + params[:id] = project.to_param + + url_for(params) + end end |