BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e7cea8cd
Commit
e7cea8cd
authored
Apr 15, 2016
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid path helper name clash
parent
2a9a9e14
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
application_controller.rb
app/controllers/projects/application_controller.rb
+4
-4
No files found.
app/controllers/projects/application_controller.rb
View file @
e7cea8cd
...
...
@@ -23,8 +23,8 @@ class Projects::ApplicationController < ApplicationController
@project
=
find_project
if
@project
&&
can?
(
current_user
,
:read_project
,
@project
)
if
@project
.
path_with_namespace
!=
p
roject_path
redirect_to
request
.
original_url
.
gsub
(
p
roject_path
,
@project
.
path_with_namespace
)
if
@project
.
path_with_namespace
!=
p
ath_with_namespace
redirect_to
request
.
original_url
.
gsub
(
p
ath_with_namespace
,
@project
.
path_with_namespace
)
end
else
@project
=
nil
...
...
@@ -48,12 +48,12 @@ class Projects::ApplicationController < ApplicationController
params
[
:namespace_id
]
end
def
p
roject_path
def
p
ath_with_namespace
"
#{
namespace
}
/
#{
id
}
"
end
def
find_project
Project
.
find_with_namespace
(
p
roject_path
)
Project
.
find_with_namespace
(
p
ath_with_namespace
)
end
def
repository
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment