diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index 5816969181e192afff54ea218b6650b05dcd0150..03171900930e2aa20a067e9c2cc9f0f0b5df5ac1 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -17,9 +17,16 @@ class GitlabAccess @actor = actor @repo_name = extract_repo_name(@repo_path.dup, config.repos_path.to_s) @changes = changes.lines + @merging = ENV['GL_MERGING'] == 'true' + + ENV['GL_MERGING'] = nil end def exec + if @merging + return true + end + status = api.check_access('git-receive-pack', @repo_name, @actor, @changes) raise AccessDeniedError, status.message unless status.allowed?