Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-05-10 17:13:05 +0300
committerBob Van Landuyt <bob@vanlanduyt.co>2018-05-11 16:20:11 +0300
commite0768a9bcb32e81fe18a77b21573969f45b47683 (patch)
tree00e91e901cad4c4ae0a616cdf7b555b5773e3aad /lib/gitlab/git_access.rb
parentd801dd177483a8375f1656654ca3638c18550204 (diff)
Allow triggered builds git access
Allow builds that have been triggered by a user before terms were enforced access to git. That way the builds can complete as usual.
Diffstat (limited to 'lib/gitlab/git_access.rb')
-rw-r--r--lib/gitlab/git_access.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 520b92a0363..db7c29be94b 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -105,7 +105,9 @@ module Gitlab
end
def check_active_user!
- if user && !user_access.allowed?
+ return unless user
+
+ unless user_access.allowed?
message = Gitlab::Auth::UserAccessDeniedReason.new(user).rejection_message
raise UnauthorizedError, message
end
@@ -338,6 +340,8 @@ module Gitlab
def user_access
@user_access ||= if ci?
CiAccess.new
+ elsif user && request_from_ci_build?
+ BuildAccess.new(user, project: project)
else
UserAccess.new(user, project: project)
end