Resolve conflicts, according to:

3f54ae10

doc/development/testing.md

@@ -150,21 +150,19 @@ always in-sync with the codebase.
 [GitLab QA]: https://gitlab.com/gitlab-org/gitlab-qa
 [part of GitLab Rails]: https://gitlab.com/gitlab-org/gitlab-ce/tree/master/qa
 
-<<<<<<< HEAD
 ### EE-specific tests
 
 EE-specific tests follows the same organization, but under the `spec/ee` folder.
-=======
+
 ## Test for what should not be there
 
 This is particularly important for permission calls and might be called a
 negative assertion: make sure only the bare minimum is returned and nothing else.
 
 See an issue about [leaking tokens] as an example of a vulnerability that is
-captured by such a test. 
+captured by such a test.
 
 [leaking tokens]: https://gitlab.com/gitlab-org/gitlab-ce/issues/37948
->>>>>>> upstream/master
 
 ## How to test at the correct level?
 

doc/user/project/integrations/kubernetes.md

@@ -47,14 +47,10 @@ The Kubernetes service takes the following parameters:
   [Kubernetes dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/#config)
   (under **Config > Secrets**).
 
-<<<<<<< HEAD
-[namespace]: https://kubernetes.io/docs/user-guide/namespaces/
-=======
 TIP: **Tip:**
 If you have a single cluster that you want to use for all your projects,
 you can pre-fill the settings page with a default template. To configure the
 template, see [Services Templates](services_templates.md).
->>>>>>> upstream/master
 
 ## Deployment variables
 

lib/gitlab/git_access.rb

@@ -173,15 +173,11 @@ module Gitlab
     # TODO: please clean this up
     def check_push_access!(changes)
       if project.repository_read_only?
-<<<<<<< HEAD
-        raise UnauthorizedError, 'The repository is temporarily read-only. Please try again later.'
+        raise UnauthorizedError, ERROR_MESSAGES[:readonly]
       end
 
       if Gitlab::Geo.secondary?
         raise UnauthorizedError, ERROR_MESSAGES[:cannot_push_to_secondary_geo]
-=======
-        raise UnauthorizedError, ERROR_MESSAGES[:readonly]
->>>>>>> upstream/master
       end
 
       if deploy_key

lib/gitlab/ldap/access.rb

@@ -19,10 +19,7 @@ module Gitlab
           # Whether user is allowed, or not, we should update
           # permissions to keep things clean
           if access.allowed?
-<<<<<<< HEAD
             access.update_user
-=======
->>>>>>> upstream/master
             Users::UpdateService.new(user, user: user, last_credential_check_at: Time.now).execute
 
             true