Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index fadd6eb848d..1aabb05f19e 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -196,11 +196,9 @@ module Gitlab
 
         return unless token
 
-        return if project && token.user.project_bot? && !project.bots.include?(token.user)
-
         return unless valid_scoped_token?(token, all_available_scopes)
 
-        if token.user.project_bot? || token.user.can?(:log_in)
+        if token.user.can?(:log_in) || token.user.can?(:bot_log_in, project)
           Gitlab::Auth::Result.new(token.user, nil, :personal_access_token, abilities_for_scopes(token.scopes))
         end
       end
@@ -285,7 +283,7 @@ module Gitlab
         return unless build.project.builds_enabled?
 
         if build.user
-          return unless build.user.can?(:log_in)
+          return unless build.user.can?(:log_in) || build.user.can?(:bot_log_in, build.project)
 
           # If user is assigned to build, use restricted credentials of user
           Gitlab::Auth::Result.new(build.user, build.project, :build, build_authentication_abilities)