Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/checks/push_check.rb b/lib/gitlab/checks/push_check.rb
index 4ee53eea25a..0f0d8bb82ec 100644
--- a/lib/gitlab/checks/push_check.rb
+++ b/lib/gitlab/checks/push_check.rb
@@ -14,9 +14,17 @@ module Gitlab
       private
 
       def can_push?
-        user_access.can_push_to_branch?(ref) ||
+        user_access_can_push? ||
           project.branch_allows_collaboration?(user_access.user, branch_name)
       end
+
+      def user_access_can_push?
+        if Feature.enabled?(:deploy_keys_on_protected_branches, project)
+          user_access.can_push_to_branch?(ref)
+        else
+          user_access.can_do_action?(:push_code)
+        end
+      end
     end
   end
 end