Resolve conflicts

app/services/groups/create_service.rb

@@ -13,15 +13,11 @@ module Groups
         return @group
       end
 
-<<<<<<< HEAD
       # Repository size limit comes as MB from the view
       limit = params.delete(:repository_size_limit)
       @group.repository_size_limit = Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
 
-      if @group.parent && !can?(current_user, :admin_group, @group.parent)
-=======
       if @group.parent && !can?(current_user, :create_subgroup, @group.parent)
->>>>>>> upstream/master
         @group.parent = nil
         @group.errors.add(:parent_id, 'You don’t have permission to create a subgroup in this group.')
 

doc/user/project/merge_requests/index.md

@@ -145,7 +145,6 @@ have been marked as a **Work In Progress**.
 
 [Learn more about settings a merge request as "Work In Progress".](work_in_progress_merge_requests.md)
 
-<<<<<<< HEAD
 ## Merge request approvals
 
 > Included in [GitLab Enterprise Edition Starter][products].
@@ -195,7 +194,7 @@ in a per-branch basis. No need to checkout the branch, install and preview local
 all your changes will be available to preview by anyone with the Review Apps link.
 
 [Read more about Review Apps.](../../../ci/review_apps/index.md)
-=======
+
 ## Merge request diff file navigation
 
 The diff view has a persistent dropdown for file navigation. As you scroll through
@@ -203,7 +202,6 @@ diffs with a large number of files and/or many changes in those files, you can
 easily jump to any changed file through the dropdown navigation.
 
 ![Merge request diff file navigation](img/merge_request_diff_file_navigation.png)
->>>>>>> upstream/master
 
 ## Ignore whitespace changes in Merge Request diff view
 

lib/gitlab/import_export/import_export.yml

@@ -98,14 +98,11 @@ excluded_attributes:
     - :last_activity_at
     - :last_repository_updated_at
     - :last_repository_check_at
-<<<<<<< HEAD
     - :mirror_last_update_at
     - :mirror_last_successful_update_at
     - :mirror_user_id
     - :mirror_trigger_builds
-=======
     - :storage_version
->>>>>>> upstream/master
   snippets:
     - :expired_at
   merge_request_diff:

spec/services/users/destroy_service_spec.rb

@@ -167,7 +167,6 @@ describe Users::DestroyService do
       end
     end
 
-<<<<<<< HEAD
     context "when the user was the mirror_user for a group project" do
       let(:group_owner) { create(:user) }
       let(:mirror_user) { create(:user) }
@@ -183,7 +182,9 @@ describe Users::DestroyService do
         service.execute(mirror_user)
 
         expect(project.reload.mirror_user).to eq group_owner
-=======
+      end
+    end
+
     describe "user personal's repository removal" do
       before do
         Sidekiq::Testing.inline! { service.execute(user) }
@@ -203,7 +204,6 @@ describe Users::DestroyService do
         it 'removes repository' do
           expect(gitlab_shell.exists?(project.repository_storage_path, "#{project.disk_path}.git")).to be_falsey
         end
->>>>>>> upstream/master
       end
     end
   end