Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee...

Merge branch 'ce-to-ee-2018-01-11' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-01-11

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

@@ -673,12 +673,7 @@
         <span class="folder-icon">
           <i
             class="fa fa-folder"
-<<<<<<< HEAD
-            aria-hidden="true"
-          >
-=======
             aria-hidden="true">
->>>>>>> upstream/master
           </i>
         </span>
 

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

 <script>
   /**
-<<<<<<< HEAD
-   * Renders the Monitoring (Metrics) link in environments table.
-   */
-=======
   * Renders the Monitoring (Metrics) link in environments table.
   */
->>>>>>> upstream/master
   import tooltip from '../../vue_shared/directives/tooltip';
 
   export default {
     directives: {
       tooltip,
-<<<<<<< HEAD
-    },
-    props: {
-      monitoringUrl: {
-        type: String,
-        required: true,
-      },
-    },
-=======
     },
 
     props: {
@@ -29,7 +15,6 @@
         required: true,
       },
     },
->>>>>>> upstream/master
 
     computed: {
       title() {

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

 <script>
   /**
-<<<<<<< HEAD
-   * Renders Rollback or Re deploy button in environments table depending
-   * of the provided property `isLastDeployment`.
-   *
-   * Makes a post request when the button is clicked.
-   */
-=======
   * Renders Rollback or Re deploy button in environments table depending
   * of the provided property `isLastDeployment`.
   *
   * Makes a post request when the button is clicked.
   */
->>>>>>> upstream/master
   import eventHub from '../event_hub';
   import loadingIcon from '../../vue_shared/components/loading_icon.vue';
 
@@ -20,16 +12,12 @@
     components: {
       loadingIcon,
     },
-<<<<<<< HEAD
-=======
 
->>>>>>> upstream/master
     props: {
       retryUrl: {
         type: String,
         default: '',
       },
-<<<<<<< HEAD
 
       isLastDeployment: {
         type: Boolean,
@@ -37,15 +25,6 @@
       },
     },
 
-=======
-
-      isLastDeployment: {
-        type: Boolean,
-        default: true,
-      },
-    },
-
->>>>>>> upstream/master
     data() {
       return {
         isLoading: false,

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

 <script>
   /**
-<<<<<<< HEAD
-   * Renders the stop "button" that allows stop an environment.
-   * Used in environments table.
-   */
-=======
   * Renders the stop "button" that allows stop an environment.
   * Used in environments table.
   */
->>>>>>> upstream/master
   import eventHub from '../event_hub';
   import loadingIcon from '../../vue_shared/components/loading_icon.vue';
   import tooltip from '../../vue_shared/directives/tooltip';
@@ -16,18 +10,11 @@
   export default {
     components: {
       loadingIcon,
-<<<<<<< HEAD
-    },
-    directives: {
-      tooltip,
-    },
-=======
     },
 
     directives: {
       tooltip,
     },
->>>>>>> upstream/master
 
     props: {
       stopUrl: {

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

 <script>
   /**
-<<<<<<< HEAD
-   * Renders a terminal button to open a web terminal.
-   * Used in environments table.
-   */
-=======
   * Renders a terminal button to open a web terminal.
   * Used in environments table.
   */
->>>>>>> upstream/master
   import terminalIconSvg from 'icons/_icon_terminal.svg';
   import tooltip from '../../vue_shared/directives/tooltip';
 
   export default {
     directives: {
       tooltip,
-<<<<<<< HEAD
-    },
-    props: {
-      terminalPath: {
-        type: String,
-        required: false,
-        default: '',
-      },
-    },
-    data() {
-      return {
-        terminalIconSvg,
-      };
-    },
-=======
     },
 
     props: {
@@ -45,7 +24,6 @@
         terminalIconSvg,
       };
     },
->>>>>>> upstream/master
 
     computed: {
       title() {

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

@@ -87,12 +87,7 @@ export default {
     </div>
     <template
       v-for="(model, i) in environments"
-<<<<<<< HEAD
-      :model="model"
-    >
-=======
       :model="model">
->>>>>>> upstream/master
       <div
         is="environment-item"
         :model="model"
@@ -100,7 +95,6 @@ export default {
         :can-read-environment="canReadEnvironment"
         :key="i"
       />
-<<<<<<< HEAD
 
       <div
         v-if="model.hasDeployBoard && model.isDeployBoardVisible"
@@ -115,20 +109,13 @@ export default {
           />
         </div>
       </div>
-=======
->>>>>>> upstream/master
 
       <template
         v-if="shouldRenderFolderContent(model)"
       >
         <div
           v-if="model.isLoadingFolderContent"
-<<<<<<< HEAD
-          :key="i"
-        >
-=======
           :key="i">
->>>>>>> upstream/master
           <loading-icon size="2" />
         </div>
 

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

@@ -29,10 +29,6 @@
         required: true,
       },
     },
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
     methods: {
       successCallback(resp) {
         this.saveData(resp);