Resolve conflicts

app/models/group.rb

@@ -248,15 +248,11 @@ class Group < Namespace
     SystemHooksService.new
   end
 
-<<<<<<< HEAD
   def first_non_empty_project
     projects.detect { |project| !project.empty_repo? }
   end
 
-  def refresh_members_authorized_projects
-=======
   def refresh_members_authorized_projects(blocking: true)
->>>>>>> upstream/master
     UserProjectAccessChangedService.new(user_ids_for_project_authorizations)
       .execute(blocking: blocking)
   end

app/services/projects/create_service.rb

@@ -103,14 +103,13 @@ module Projects
       system_hook_service.execute_hooks_for(@project, :create)
 
       setup_authorizations
-    end
 
-<<<<<<< HEAD
       # EE-only
       create_predefined_push_rule
 
       @project.group&.refresh_members_authorized_projects
-=======
+    end
+
     # Refresh the current user's authorizations inline (so they can access the
     # project immediately after this request completes), and any other affected
     # users in the background
@@ -121,7 +120,6 @@ module Projects
       else
         @project.add_master(@project.namespace.owner, current_user: current_user)
       end
->>>>>>> upstream/master
     end
 
     def skip_wiki?

app/views/projects/boards/_show.html.haml

-<<<<<<< HEAD
 - board = local_assigns.fetch(:board, nil)
-=======
 - @no_breadcrumb_container = true
->>>>>>> upstream/master
 - @no_container = true
 - @content_class = "issue-boards-content js-focus-mode-board"
 - page_title "Boards"

spec/features/issues/filtered_search/filter_issues_spec.rb

@@ -178,7 +178,6 @@ describe 'Filter issues', js: true do
         expect_issues_list_count(8, 1)
         expect_filtered_search_input_empty
       end
-<<<<<<< HEAD
 
       it 'filters issues by invalid assignee' do
         skip('to be tested, issue #26546')
@@ -197,8 +196,6 @@ describe 'Filter issues', js: true do
         expect_issues_list_count(1)
         expect_filtered_search_input_empty
       end
-=======
->>>>>>> upstream/master
     end
 
     context 'assignee with other filters' do

spec/models/repository_spec.rb

@@ -2187,7 +2187,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)
@@ -2203,10 +2202,7 @@ describe Repository, models: true do
     rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target.id)
   end
 
-  describe '#is_ancestor?' do
-=======
   describe '#ancestor?' do
->>>>>>> upstream/master
     let(:commit) { repository.commit }
     let(:ancestor) { commit.parents.first }