Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
e17e5a5c
Commit
e17e5a5c
authored
Oct 21, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move case sensitivity check to find_with_namespace.
parent
2f7fc7e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
11 deletions
+4
-11
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+1
-2
app/models/project.rb
app/models/project.rb
+3
-9
No files found.
app/controllers/application_controller.rb
View file @
e17e5a5c
...
@@ -118,8 +118,7 @@ class ApplicationController < ActionController::Base
...
@@ -118,8 +118,7 @@ class ApplicationController < ActionController::Base
end
end
project_path
=
"
#{
namespace
}
/
#{
id
}
"
project_path
=
"
#{
namespace
}
/
#{
id
}
"
@project
=
Project
.
find_with_namespace
(
project_path
)
||
@project
=
Project
.
find_with_namespace
(
project_path
)
Project
.
find_with_namespace
(
project_path
,
case_sensitive:
false
)
if
@project
and
can?
(
current_user
,
:read_project
,
@project
)
if
@project
and
can?
(
current_user
,
:read_project
,
@project
)
if
@project
.
path_with_namespace
!=
project_path
if
@project
.
path_with_namespace
!=
project_path
...
...
app/models/project.rb
View file @
e17e5a5c
...
@@ -235,7 +235,7 @@ class Project < ActiveRecord::Base
...
@@ -235,7 +235,7 @@ class Project < ActiveRecord::Base
where
(
'projects.archived = ?'
,
false
).
where
(
'LOWER(projects.name) LIKE :query'
,
query:
"%
#{
query
.
downcase
}
%"
)
where
(
'projects.archived = ?'
,
false
).
where
(
'LOWER(projects.name) LIKE :query'
,
query:
"%
#{
query
.
downcase
}
%"
)
end
end
def
find_with_namespace
(
id
,
case_sensitive:
true
)
def
find_with_namespace
(
id
)
namespace_path
,
project_path
=
id
.
split
(
'/'
)
namespace_path
,
project_path
=
id
.
split
(
'/'
)
return
nil
if
!
namespace_path
||
!
project_path
return
nil
if
!
namespace_path
||
!
project_path
...
@@ -247,14 +247,8 @@ class Project < ActiveRecord::Base
...
@@ -247,14 +247,8 @@ class Project < ActiveRecord::Base
joins
(
:namespace
).
joins
(
:namespace
).
iwhere
(
'namespaces.path'
=>
namespace_path
)
iwhere
(
'namespaces.path'
=>
namespace_path
)
projects
=
projects
.
where
(
'projects.path'
=>
project_path
).
take
||
if
case_sensitive
projects
.
iwhere
(
'projects.path'
=>
project_path
).
take
projects
.
where
(
'projects.path'
=>
project_path
)
else
projects
.
iwhere
(
'projects.path'
=>
project_path
)
end
projects
.
take
end
end
def
visibility_levels
def
visibility_levels
...
...
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