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
Jérome Perrin
gitlab-ce
Commits
5f88aafb
Commit
5f88aafb
authored
Sep 27, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve the logic in AccessRequestsFinder#execute & #execute!
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
924a6b7d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
app/finders/access_requests_finder.rb
app/finders/access_requests_finder.rb
+9
-11
No files found.
app/finders/access_requests_finder.rb
View file @
5f88aafb
...
...
@@ -7,23 +7,21 @@ class AccessRequestsFinder
@source
=
source
end
def
execute
(
current_user
,
raise_error:
false
)
if
cannot_see_access_requests?
(
current_user
)
raise
Gitlab
::
Access
::
AccessDeniedError
if
raise_error
return
[]
end
source
.
requesters
def
execute
(
*
args
)
execute!
(
*
args
)
rescue
Gitlab
::
Access
::
AccessDeniedError
[]
end
def
execute!
(
current_user
)
execute
(
current_user
,
raise_error:
true
)
raise
Gitlab
::
Access
::
AccessDeniedError
unless
can_see_access_requests?
(
current_user
)
source
.
requesters
end
private
def
can
not
_see_access_requests?
(
current_user
)
!
source
||
!
current_user
||
!
current_user
.
can?
(
:"admin_
#{
source
.
class
.
to_s
.
underscore
}
"
,
source
)
def
can_see_access_requests?
(
current_user
)
source
&&
current_user
&&
current_user
.
can?
(
:"admin_
#{
source
.
class
.
to_s
.
underscore
}
"
,
source
)
end
end
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