summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2017-03-13 12:31:27 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2017-03-13 12:31:27 +0100
commit47270e1cfdee8e54bc7cc7f4b374ce795a1797fc (patch)
tree65d155525b14eb2d9bb4dfc4d341c645e58ca387 /lib
parent32da7602686f2b8161175d82b121deb9e01b2db5 (diff)
downloadgitlab-ce-47270e1cfdee8e54bc7cc7f4b374ce795a1797fc.tar.gz
Backport changes from gitlab-org/gitlab-ee!1406adam-backport-ee-1406
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/checks/change_access.rb8
-rw-r--r--lib/gitlab/git_access.rb4
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb
index 273118135a9..c85f79127bc 100644
--- a/lib/gitlab/checks/change_access.rb
+++ b/lib/gitlab/checks/change_access.rb
@@ -1,16 +1,20 @@
module Gitlab
module Checks
class ChangeAccess
- attr_reader :user_access, :project, :skip_authorization
+ # protocol is currently used only in EE
+ attr_reader :user_access, :project, :skip_authorization, :protocol
def initialize(
- change, user_access:, project:, env: {}, skip_authorization: false)
+ change, user_access:, project:, env: {}, skip_authorization: false,
+ protocol:
+ )
@oldrev, @newrev, @ref = change.values_at(:oldrev, :newrev, :ref)
@branch_name = Gitlab::Git.branch_name(@ref)
@user_access = user_access
@project = project
@env = env
@skip_authorization = skip_authorization
+ @protocol = protocol
end
def exec
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index ffb178334bc..eea2f206902 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -153,7 +153,9 @@ module Gitlab
user_access: user_access,
project: project,
env: @env,
- skip_authorization: deploy_key?).exec
+ skip_authorization: deploy_key?,
+ protocol: protocol
+ ).exec
end
def matching_merge_request?(newrev, branch_name)