From 1de0c935434a3d747860ab22e35cffda25d1a2f5 Mon Sep 17 00:00:00 2001
From: Mathias Vestergaard <mathias.vestergaard@gmail.com>
Date: Fri, 20 May 2016 01:42:17 +0200
Subject: [PATCH] Added ability to skip access check if merging

---
 lib/gitlab_access.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb
index 581696918..031719009 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?
-- 
GitLab