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/boards/components/board_card.vue

@@ -35,12 +35,9 @@ export default {
       type: String,
       default: '',
     },
-<<<<<<< HEAD
     groupId: {
       type: Number,
     },
-=======
->>>>>>> upstream/master
   },
   data() {
     return {

app/assets/javascripts/clusters/components/application_row.vue

@@ -67,13 +67,8 @@
         // Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but
         // we already made a request to install and are just waiting for the real-time
         // to sync up.
-<<<<<<< HEAD
         return (this.status !== APPLICATION_INSTALLABLE &&
           this.status !== APPLICATION_ERROR) ||
-=======
-        return (this.status !== APPLICATION_INSTALLABLE
-          && this.status !== APPLICATION_ERROR) ||
->>>>>>> upstream/master
           this.requestStatus === REQUEST_LOADING ||
           this.requestStatus === REQUEST_SUCCESS;
       },

app/assets/javascripts/commit/pipelines/pipelines_table.vue

@@ -7,10 +7,6 @@
     mixins: [
       pipelinesMixin,
     ],
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master
     props: {
       endpoint: {
         type: String,

app/assets/javascripts/cycle_analytics/components/stage_code_component.vue

@@ -43,12 +43,7 @@
           </h5>
           <a
             :href="mergeRequest.url"
-<<<<<<< HEAD
-            class="issue-link"
-          >
-=======
             class="issue-link">
->>>>>>> upstream/master
             !{{ mergeRequest.iid }}
           </a>
           &middot;
@@ -56,12 +51,7 @@
             {{ s__('OpenedNDaysAgo|Opened') }}
             <a
               :href="mergeRequest.url"
-<<<<<<< HEAD
-              class="issue-date"
-            >
-=======
               class="issue-date">
->>>>>>> upstream/master
               {{ mergeRequest.createdAt }}
             </a>
           </span>
@@ -69,12 +59,7 @@
             {{ s__('ByAuthor|by') }}
             <a
               :href="mergeRequest.author.webUrl"
-<<<<<<< HEAD
-              class="issue-author-link"
-            >
-=======
               class="issue-author-link">
->>>>>>> upstream/master
               {{ mergeRequest.author.name }}
             </a>
           </span>

app/assets/javascripts/cycle_analytics/components/stage_component.vue

@@ -47,26 +47,14 @@
           <a
             :href="issue.url"
             class="issue-link"
-<<<<<<< HEAD
-          >
-            #{{ issue.iid }}
-          </a>
-=======
           >#{{ issue.iid }}</a>
->>>>>>> upstream/master
           &middot;
           <span>
             {{ s__('OpenedNDaysAgo|Opened') }}
             <a
               :href="issue.url"
               class="issue-date"
-<<<<<<< HEAD
-            >
-              {{ issue.createdAt }}
-            </a>
-=======
             >{{ issue.createdAt }}</a>
->>>>>>> upstream/master
           </span>
           <span>
             {{ s__('ByAuthor|by') }}