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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
66a484c9
Commit
66a484c9
authored
Mar 15, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improve-project-lookup' into 'master'
Improve Project Lookup Fixes #1080
parents
7c5320d2
a9f2903e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
app/models/project.rb
app/models/project.rb
+7
-9
lib/api/helpers.rb
lib/api/helpers.rb
+1
-1
No files found.
app/models/project.rb
View file @
66a484c9
...
@@ -177,15 +177,13 @@ class Project < ActiveRecord::Base
...
@@ -177,15 +177,13 @@ class Project < ActiveRecord::Base
end
end
def
find_with_namespace
(
id
)
def
find_with_namespace
(
id
)
if
id
.
include?
(
"/"
)
return
nil
unless
id
.
include?
(
"/"
)
id
=
id
.
split
(
"/"
)
id
=
id
.
split
(
"/"
)
namespace
=
Namespace
.
find_by
(
path:
id
.
first
)
namespace
=
Namespace
.
find_by
(
path:
id
.
first
)
return
nil
unless
namespace
return
nil
unless
namespace
where
(
namespace_id:
namespace
.
id
).
find_by
(
path:
id
.
second
)
where
(
namespace_id:
namespace
.
id
).
find_by
(
path:
id
.
second
)
else
where
(
path:
id
,
namespace_id:
nil
).
last
end
end
end
def
visibility_levels
def
visibility_levels
...
...
lib/api/helpers.rb
View file @
66a484c9
...
@@ -47,7 +47,7 @@ module API
...
@@ -47,7 +47,7 @@ module API
end
end
def
find_project
(
id
)
def
find_project
(
id
)
project
=
Project
.
find_
by
(
id:
id
)
||
Project
.
find_with_namespace
(
id
)
project
=
Project
.
find_
with_namespace
(
id
)
||
Project
.
find_by
(
id:
id
)
if
project
&&
can?
(
current_user
,
:read_project
,
project
)
if
project
&&
can?
(
current_user
,
:read_project
,
project
)
project
project
...
...
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