Merge branch 'ce-to-ee-2018-09-08' into 'master'

CE upstream - 2018-09-08 15:21 UTC

See merge request gitlab-org/gitlab-ee!7294

lib/gitlab/git_access.rb

@@ -247,8 +247,6 @@ module Gitlab
         end
       elsif user
         # User access is verified in check_change_access!
-      elsif authed_via_jwt?
-        # Authenticated via JWT
       else
         # You are not allowed to upload code for this project.
         raise UnauthorizedError, ERROR_MESSAGES[:upload]
@@ -357,10 +355,6 @@ module Gitlab
       !Gitlab.config.gitlab_shell.receive_pack
     end
 
-    def authed_via_jwt?
-      false
-    end
-
     protected
 
     def check_size_limit?