Resolve conflicts

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

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

@@ -89,7 +89,6 @@ export default Vue.component('environment-component', {
   },
 
   methods: {
-<<<<<<< HEAD
 
     /**
      * Toggles the visibility of the deploy boards of the clicked environment.
@@ -101,8 +100,6 @@ export default Vue.component('environment-component', {
       return this.store.toggleDeployBoard(model.id);
     },
 
-=======
->>>>>>> ce/master
     toggleFolder(folder, folderUrl) {
       this.store.toggleFolder(folder);
 
@@ -226,11 +223,8 @@ export default Vue.component('environment-component', {
             :environments="state.environments"
             :can-create-deployment="canCreateDeploymentParsed"
             :can-read-environment="canReadEnvironmentParsed"
-<<<<<<< HEAD
             :toggleDeployBoard="toggleDeployBoard"
             :store="store"
-=======
->>>>>>> ce/master
             :service="service"
             :is-loading-folder-content="isLoadingFolderContent" />
         </div>

app/assets/javascripts/environments/components/environment_item.js

@@ -465,12 +465,8 @@ export default {
           :href="environmentPath">
           {{model.name}}
         </a>
-<<<<<<< HEAD
 
         <span v-if="model.isFolder"
-=======
-        <span v-else
->>>>>>> ce/master
           class="folder-name"
           @click="onClickFolder"
           role="button">

app/assets/javascripts/environments/components/environments_table.js

@@ -98,7 +98,6 @@ export default {
             :toggleDeployBoard="toggleDeployBoard"
             :service="service"></tr>
 
-<<<<<<< HEAD
           <tr v-if="model.hasDeployBoard && model.isDeployBoardVisible" class="js-deploy-board-row">
             <td colspan="6" class="deploy-board-container">
               <deploy-board
@@ -111,8 +110,6 @@ export default {
             </td>
           </tr>
 
-=======
->>>>>>> ce/master
           <template v-if="model.isFolder && model.isOpen && model.children && model.children.length > 0">
             <tr v-if="isLoadingFolderContent">
               <td colspan="6" class="text-center">

app/assets/javascripts/environments/stores/environments_store.js

@@ -121,7 +121,6 @@ export default class EnvironmentsStore {
   }
 
   /**
-<<<<<<< HEAD
    * Toggles deploy board visibility for the provided environment ID.
    *
    * @param  {Object} environment
@@ -164,8 +163,6 @@ export default class EnvironmentsStore {
   }
 
   /*
-=======
->>>>>>> ce/master
     * Toggles folder open property for the given folder.
     *
     * @param  {Object} folder
@@ -226,8 +223,4 @@ export default class EnvironmentsStore {
 
     return updatedEnvironments;
   }
-<<<<<<< HEAD
-=======
-
->>>>>>> ce/master
 }

app/assets/javascripts/main.js

@@ -187,7 +187,6 @@ import './visibility_select';
 import './wikis';
 import './zen_mode';
 
-<<<<<<< HEAD
 // EE-only scripts
 require('./admin_email_select');
 require('./application_settings');
@@ -196,8 +195,6 @@ require('./ldap_groups_select');
 require('./path_locks');
 require('./weight_select');
 
-=======
->>>>>>> ce/master
 // eslint-disable-next-line global-require
 if (process.env.NODE_ENV !== 'production') require('./test_utils/');
 

app/assets/stylesheets/pages/boards.scss

@@ -101,13 +101,8 @@
 
   @media (min-width: $screen-sm-min) {
     height: 475px; // Needed for PhantomJS
-<<<<<<< HEAD
-    height: calc(100vh - 220px);
-    min-height: 409px;
-=======
     height: calc(100vh - 222px);
     min-height: 475px;
->>>>>>> ce/master
     transition: width .2s;
 
     &.is-compact {

spec/javascripts/environments/environment_spec.js

@@ -279,14 +279,9 @@ describe('Environment', () => {
           setTimeout(() => {
             expect(component.$el.querySelectorAll('.js-child-row').length).toEqual(1);
             expect(component.$el.querySelector('td.text-center > a.btn').textContent).toContain('Show all');
-<<<<<<< HEAD
-            done();
-            Vue.http.interceptors = _.without(Vue.http.interceptors, folderInterceptor);
-=======
 
             Vue.http.interceptors = _.without(Vue.http.interceptors, folderInterceptor);
             done();
->>>>>>> ce/master
           });
         });
       });

spec/javascripts/environments/environments_store_spec.js

@@ -14,7 +14,6 @@ describe('Store', () => {
     expect(store.state.availableCounter).toEqual(0);
     expect(store.state.paginationInformation).toEqual({});
   });
-<<<<<<< HEAD
 
   it('should store environments', () => {
     const expectedResult = {
@@ -39,13 +38,6 @@ describe('Store', () => {
     store.storeEnvironments(serverData);
     expect(store.state.environments.length).toEqual(serverData.length);
     expect(store.state.environments[0]).toEqual(expectedResult);
-=======
-
-  it('should store environments', () => {
-    store.storeEnvironments(serverData);
-    expect(store.state.environments.length).toEqual(serverData.length);
-    expect(store.state.environments[0]).toEqual(environmentsList[0]);
->>>>>>> ce/master
   });
 
   it('should store available count', () => {
@@ -64,7 +56,6 @@ describe('Store', () => {
       expect(store.state.environments.length).toEqual(serverData.length);
     });
 
-<<<<<<< HEAD
     it('should store a non folder environment with deploy board if rollout_status_path key is provided', () => {
       const environment = {
         name: 'foo',
@@ -79,8 +70,6 @@ describe('Store', () => {
       expect(store.state.environments[0].deployBoardData).toEqual({});
     });
 
-=======
->>>>>>> ce/master
     it('should add folder keys when environment is a folder', () => {
       const environment = {
         name: 'bar',
@@ -111,11 +100,7 @@ describe('Store', () => {
 
     it('should store latest.name when the environment is not a folder', () => {
       store.storeEnvironments(serverData);
-<<<<<<< HEAD
       expect(store.state.environments[2].name).toEqual(serverData[2].latest.name);
-=======
-      expect(store.state.environments[0].name).toEqual(serverData[0].latest.name);
->>>>>>> ce/master
     });
 
     it('should store root level name when environment is a folder', () => {
@@ -171,7 +156,6 @@ describe('Store', () => {
       expect(store.state.paginationInformation).toEqual(expectedResult);
     });
   });
-<<<<<<< HEAD
 
   describe('deploy boards', () => {
     beforeEach(() => {
@@ -194,6 +178,4 @@ describe('Store', () => {
       expect(store.state.environments[0].deployBoardData).toEqual(deployBoardMockData);
     });
   });
-=======
->>>>>>> ce/master
 });