Resolve spec/models/repository_spec.rb

spec/models/repository_spec.rb

@@ -1992,7 +1992,6 @@ describe Repository, models: true do
     end
   end
 
-<<<<<<< HEAD
   describe '#after_sync' do
     it 'expires repository cache' do
       expect(repository).to receive(:expire_all_method_caches)
@@ -2008,20 +2007,6 @@ describe Repository, models: true do
     rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id)
   end
 
-  # TODO: Uncomment when feature is reenabled
-  # describe '#is_ancestor?' do
-  #   context 'Gitaly is_ancestor feature enabled' do
-  #     it 'asks Gitaly server if it\'s an ancestor' do
-  #       commit = repository.commit
-  #       allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(:is_ancestor).and_return(true)
-  #       expect(Gitlab::GitalyClient::Commit).to receive(:is_ancestor).
-  #         with(repository.raw_repository, commit.id, commit.id).and_return(true)
-  #
-  #       expect(repository.is_ancestor?(commit.id, commit.id)).to be true
-  #     end
-  #   end
-  # end
-=======
   describe '#is_ancestor?' do
     context 'Gitaly is_ancestor feature enabled' do
       it "asks Gitaly server if it's an ancestor" do
@@ -2033,5 +2018,4 @@ describe Repository, models: true do
       end
     end
   end
->>>>>>> ce-com/master
 end