Resolve conflicts

app/assets/javascripts/environments/components/environment.vue

@@ -221,27 +221,6 @@ export default {
           <a :href="helpPagePath">
             Read more about environments
           </a>
-<<<<<<< HEAD:app/assets/javascripts/environments/components/environment.js
-        </div>
-
-        <div class="table-holder"
-          v-if="!isLoading && state.environments.length > 0">
-
-          <environment-table
-            :environments="state.environments"
-            :can-create-deployment="canCreateDeploymentParsed"
-            :can-read-environment="canReadEnvironmentParsed"
-            :toggleDeployBoard="toggleDeployBoard"
-            :store="store"
-            :service="service"
-            :is-loading-folder-content="isLoadingFolderContent" />
-        </div>
-
-        <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
-          :change="changePage"
-          :pageInfo="state.paginationInformation">
-        </table-pagination>
-=======
         </p>
 
         <a
@@ -250,7 +229,6 @@ export default {
           class="btn btn-create js-new-environment-button">
           New Environment
         </a>
->>>>>>> ce/master:app/assets/javascripts/environments/components/environment.vue
       </div>
 
       <div
@@ -261,6 +239,8 @@ export default {
           :environments="state.environments"
           :can-create-deployment="canCreateDeploymentParsed"
           :can-read-environment="canReadEnvironmentParsed"
+          :toggleDeployBoard="toggleDeployBoard"
+          :store="store"
           :service="service"
           :is-loading-folder-content="isLoadingFolderContent" />
       </div>

app/assets/javascripts/environments/folder/environments_folder_view.vue

@@ -177,7 +177,6 @@ export default {
         class="table-holder"
         v-if="!isLoading && state.environments.length > 0">
 
-<<<<<<< HEAD:app/assets/javascripts/environments/folder/environments_folder_view.js
         <environment-table
           :environments="state.environments"
           :can-create-deployment="canCreateDeploymentParsed"
@@ -185,13 +184,6 @@ export default {
           :toggleDeployBoard="toggleDeployBoard"
           :store="store"
           :service="service"/>
-=======
-        <environment-table
-          :environments="state.environments"
-          :can-create-deployment="canCreateDeploymentParsed"
-          :can-read-environment="canReadEnvironmentParsed"
-          :service="service"/>
->>>>>>> ce/master:app/assets/javascripts/environments/folder/environments_folder_view.vue
 
         <table-pagination
           v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"

app/policies/project_policy.rb

@@ -5,10 +5,7 @@ class ProjectPolicy < BasePolicy
     team_access!(user)
 
     owner_access! if user.admin? || owner?
-<<<<<<< HEAD
     auditor_access! if user.auditor?
-=======
->>>>>>> ce/master
     team_member_owner_access! if owner?
 
     if project.public? || (project.internal? && !user.external?)

spec/controllers/projects_controller_spec.rb

@@ -420,7 +420,6 @@ describe ProjectsController do
     end
   end
 
-<<<<<<< HEAD
   describe 'GET edit' do
     it 'does not allow an auditor user to access the page' do
       sign_in(create(:user, :auditor))
@@ -440,7 +439,9 @@ describe ProjectsController do
           id: project.path
 
       expect(response).to have_http_status(200)
-=======
+    end
+  end
+
   describe 'POST #preview_markdown' do
     it 'renders json in a correct format' do
       sign_in(user)
@@ -448,7 +449,6 @@ describe ProjectsController do
       post :preview_markdown, namespace_id: public_project.namespace, id: public_project, text: '*Markdown* text'
 
       expect(JSON.parse(response.body).keys).to match_array(%w(body references))
->>>>>>> ce/master
     end
   end
 end

spec/features/projects/milestones/milestone_spec.rb

@@ -64,7 +64,6 @@ feature 'Project milestone', :feature do
     end
   end
 
-<<<<<<< HEAD
   # EE-only
   context 'milestone summary' do
     it 'shows the total weight when sum is greater than zero' do
@@ -94,7 +93,7 @@ feature 'Project milestone', :feature do
   def milestone_path
     namespace_project_milestone_path(project.namespace, project, milestone)
   end
-=======
+
   context 'when project has an issue' do
     before do
       create(:issue, project: project, milestone: milestone)
@@ -113,10 +112,9 @@ feature 'Project milestone', :feature do
 
         aggregate_failures 'MR and issue blocks' do
           expect(blocks[3]).to have_content 1
-          expect(blocks[4]).to have_content 0
+          expect(blocks[5]).to have_content 0
         end
       end
     end
   end
->>>>>>> ce/master
 end