root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid path helper name clash

This commit is contained in:
Jacob Vosmaer 2016-04-15 11:22:08 +02:00
parent 2a9a9e147b
commit e7cea8cd75
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/projects/application_controller.rb
View File

@ -23,8 +23,8 @@ class Projects::ApplicationController < ApplicationController
@project = find_project
if @project && can?(current_user, :read_project, @project)
if @project.path_with_namespace != project_path
redirect_to request.original_url.gsub(project_path, @project.path_with_namespace)
if @project.path_with_namespace != path_with_namespace
redirect_to request.original_url.gsub(path_with_namespace, @project.path_with_namespace)
end
else
@project = nil
@ -48,12 +48,12 @@ class Projects::ApplicationController < ApplicationController
params[:namespace_id]
end
def project_path
def path_with_namespace
"#{namespace}/#{id}"
end
def find_project
Project.find_with_namespace(project_path)
Project.find_with_namespace(path_with_namespace)
end
def repository