Resolve conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG-EE.md

@@ -6,6 +6,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Move RepositoryUpdateRemoteMirrorWorker jobs to project_mirror Sidekiq queue. !1234
 - Fixed merge request environment link not displaying.
 - Reduce queries needed to check if node is a primary or secondary Geo node.
+- Read true-up info from license and validate it. !1159
 
 ## 8.16.5 (2017-02-14)
 

CHANGELOG.md

@@ -5,10 +5,6 @@ entry.
 ## 8.16.6 (2017-02-17)
 
 - API: Fix file downloading. !0 (8267)
-<<<<<<< HEAD
-- Read true-up info from license and validate it. !1159
-=======
->>>>>>> ce/master
 - Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms. !8752
 - Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory. !8891
 - Fix wrong call to ProjectCacheWorker.perform. !8910

app/services/projects/destroy_service.rb

@@ -17,12 +17,8 @@ module Projects
     def execute
       return false unless can?(current_user, :remove_project, project)
 
-<<<<<<< HEAD
-      project.team.truncate
-=======
       repo_path = project.path_with_namespace
       wiki_path = repo_path + '.wiki'
->>>>>>> ce/master
 
       # Flush the cache for both repositories. This has to be done _before_
       # removing the physical repositories as some expiration code depends on

doc/README.md

@@ -23,11 +23,8 @@
 - [Profile Settings](profile/README.md)
 - [Project Services](user/project/integrations//project_services.md) Integrate a project with external services, such as CI and chat.
 - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects.
-<<<<<<< HEAD
 - [Analytics](analytics/README.md)
-=======
 - [Snippets](user/snippets.md) Snippets allow you to create little bits of code.
->>>>>>> ce/master
 - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
 - [Webhooks](user/project/integrations/webhooks.md) Let GitLab notify you when new code has been pushed to your project.
 - [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.

spec/lib/gitlab/import_export/project_tree_restorer_spec.rb

@@ -15,13 +15,6 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
       end
     end
 
-<<<<<<< HEAD
-    after(:all) do
-      DatabaseCleaner.clean_with(:truncation)
-    end
-
-=======
->>>>>>> ce/master
     context 'JSON' do
       it 'restores models based on JSON' do
         expect(@restored_project_json).to be true

spec/requests/api/users_spec.rb

@@ -1042,13 +1042,8 @@ describe API::Users, api: true do
     end
   end
 
-<<<<<<< HEAD
-  describe 'PUT /users/:id/unblock' do
-    let(:blocked_user) { create(:user, state: 'blocked') }
-=======
   describe 'POST /users/:id/unblock' do
     let(:blocked_user)  { create(:user, state: 'blocked') }
->>>>>>> ce/master
     before { admin }
 
     it 'unblocks existing user' do