Fix conflicts in git / wiki access

lib/gitlab/git_access_wiki.rb

 module Gitlab
   class GitAccessWiki < GitAccess
     ERROR_MESSAGES = {
-<<<<<<< HEAD
       geo:           "You can't push code to a secondary GitLab Geo node.",
-=======
->>>>>>> master
       write_to_wiki: "You are not allowed to write to this project's wiki."
     }.freeze
 
@@ -17,17 +14,14 @@ module Gitlab
     end
 
     def check_single_change_access(change)
-<<<<<<< HEAD
-      if Gitlab::Geo.enabled? && Gitlab::Geo.secondary?
-        raise UnauthorizedError, ERROR_MESSAGES[:geo]
-      end
-
-=======
->>>>>>> master
       unless user_access.can_do_action?(:create_wiki)
         raise UnauthorizedError, ERROR_MESSAGES[:write_to_wiki]
       end
 
+      if Gitlab::Geo.enabled? && Gitlab::Geo.secondary?
+        raise UnauthorizedError, ERROR_MESSAGES[:geo]
+      end
+
       true
     end
   end

spec/lib/gitlab/git_access_spec.rb

@@ -8,10 +8,7 @@ describe Gitlab::GitAccess, lib: true do
   let(:user) { create(:user) }
   let(:actor) { user }
   let(:protocol) { 'ssh' }
-<<<<<<< HEAD
-=======
 
->>>>>>> master
   let(:authentication_abilities) do
     [
       :read_project,
@@ -172,7 +169,6 @@ describe Gitlab::GitAccess, lib: true do
         before do
           allow(Gitlab.config.gitlab_shell).to receive(:upload_pack).and_return(false)
         end
-<<<<<<< HEAD
 
         context 'when calling git-upload-pack' do
           it { expect { pull_access_check }.to raise_unauthorized('Pulling over HTTP is not allowed.') }
@@ -199,34 +195,6 @@ describe Gitlab::GitAccess, lib: true do
     end
   end
 
-=======
-
-        context 'when calling git-upload-pack' do
-          it { expect { pull_access_check }.to raise_unauthorized('Pulling over HTTP is not allowed.') }
-        end
-
-        context 'when calling git-receive-pack' do
-          it { expect { push_access_check }.not_to raise_error }
-        end
-      end
-
-      context 'when the git-receive-pack command is disabled in config' do
-        before do
-          allow(Gitlab.config.gitlab_shell).to receive(:receive_pack).and_return(false)
-        end
-
-        context 'when calling git-receive-pack' do
-          it { expect { push_access_check }.to raise_unauthorized('Pushing over HTTP is not allowed.') }
-        end
-
-        context 'when calling git-upload-pack' do
-          it { expect { pull_access_check }.not_to raise_error }
-        end
-      end
-    end
-  end
-
->>>>>>> master
   describe '#check_download_access!' do
     describe 'master permissions' do
       before { project.team << [user, :master] }

spec/lib/gitlab/git_access_wiki_spec.rb

@@ -31,13 +31,9 @@ describe Gitlab::GitAccessWiki, lib: true do
           allow(Gitlab::Geo).to receive(:license_allows?) { true }
         end
 
-<<<<<<< HEAD
-        it { expect { subject }.to raise_error(Gitlab::GitAccess::UnauthorizedError, "You can't push code to a secondary GitLab Geo node.") }
-=======
         it 'does not give access to upload wiki code' do
           expect { subject }.to raise_error(Gitlab::GitAccess::UnauthorizedError, "You can't push code to a secondary GitLab Geo node.")
         end
->>>>>>> master
       end
     end
   end