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
0e3cfc75
Commit
0e3cfc75
authored
May 23, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove GitAccessStatus (no longer needed)
parent
b50a2289
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
26 deletions
+9
-26
change_access.rb
lib/gitlab/checks/change_access.rb
+2
-2
git_access.rb
lib/gitlab/git_access.rb
+4
-10
git_access_status.rb
lib/gitlab/git_access_status.rb
+0
-11
git_access_wiki.rb
lib/gitlab/git_access_wiki.rb
+3
-3
No files found.
lib/gitlab/checks/change_access.rb
View file @
0e3cfc75
...
...
@@ -31,13 +31,13 @@ module Gitlab
end
def
exec
return
GitAccessStatus
.
new
(
true
)
if
skip_authorization
return
true
if
skip_authorization
push_checks
branch_checks
tag_checks
GitAccessStatus
.
new
(
true
)
true
end
protected
...
...
lib/gitlab/git_access.rb
View file @
0e3cfc75
...
...
@@ -51,7 +51,7 @@ module Gitlab
check_push_access!
(
changes
)
end
build_status_object
(
true
)
true
end
def
guest_can_download_code?
...
...
@@ -167,11 +167,9 @@ module Gitlab
# Iterate over all changes to find if user allowed all of them to be applied
changes_list
.
each
do
|
change
|
status
=
check_single_change_access
(
change
)
unless
status
.
allowed?
# If user does not have access to make at least one change - cancel all push
raise
UnauthorizedError
,
status
.
message
end
# If user does not have access to make at least one change, cancel all
# push by allowing the exception to bubble up
check_single_change_access
(
change
)
end
end
...
...
@@ -246,9 +244,5 @@ module Gitlab
nil
end
end
def
build_status_object
(
status
)
Gitlab
::
GitAccessStatus
.
new
(
status
)
end
end
end
lib/gitlab/git_access_status.rb
deleted
100644 → 0
View file @
b50a2289
module
Gitlab
class
GitAccessStatus
attr_accessor
:status
,
:message
alias_method
:allowed?
,
:status
def
initialize
(
status
,
message
=
''
)
@status
=
status
@message
=
message
end
end
end
lib/gitlab/git_access_wiki.rb
View file @
0e3cfc75
...
...
@@ -13,11 +13,11 @@ module Gitlab
end
def
check_single_change_access
(
change
)
if
user_access
.
can_do_action?
(
:create_wiki
)
build_status_object
(
true
)
else
unless
user_access
.
can_do_action?
(
:create_wiki
)
raise
UnauthorizedError
,
ERROR_MESSAGES
[
:write_to_wiki
]
end
true
end
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