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/cycle_analytics/components/stage_plan_component.vue

@@ -57,13 +57,7 @@
             <a
               :href="commit.commitUrl"
               class="commit-hash-link commit-sha"
-<<<<<<< HEAD
-            >
-              {{ commit.shortSha }}
-            </a>
-=======
             >{{ commit.shortSha }}</a>
->>>>>>> upstream/master
             {{ s__('FirstPushedBy|pushed by') }}
             <a
               :href="commit.author.webUrl"

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

@@ -46,13 +46,7 @@
           <a
             :href="mergeRequest.url"
             class="issue-link"
-<<<<<<< HEAD
-          >
-            !{{ mergeRequest.iid }}
-          </a>
-=======
           >!{{ mergeRequest.iid }}</a>
->>>>>>> upstream/master
           &middot;
           <span>
             {{ s__('OpenedNDaysAgo|Opened') }}

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

@@ -63,12 +63,8 @@
             </a>
             <span
               class="icon-branch"
-<<<<<<< HEAD
-              v-html="iconBranch">
-=======
               v-html="iconBranch"
             >
->>>>>>> upstream/master
             </span>
             <a
               :href="build.commitUrl"

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

@@ -80,24 +80,14 @@
             </span>
             <a
               :href="build.commitUrl"
-<<<<<<< HEAD
-              class="commit-sha"
-            >
-=======
               class="commit-sha">
->>>>>>> upstream/master
               {{ build.shortSha }}
             </a>
           </h5>
           <span>
             <a
               :href="build.url"
-<<<<<<< HEAD
-              class="issue-date"
-            >
-=======
               class="issue-date">
->>>>>>> upstream/master
               {{ build.date }}
             </a>
           </span>

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

@@ -72,12 +72,8 @@
         <span v-html="playIconSvg"></span>
         <i
           class="fa fa-caret-down"
-<<<<<<< HEAD
-          aria-hidden="true">
-=======
           aria-hidden="true"
         >
->>>>>>> upstream/master
         </i>
         <loading-icon v-if="isLoading" />
       </span>
@@ -86,12 +82,7 @@
     <ul class="dropdown-menu dropdown-menu-align-right">
       <li
         v-for="(action, i) in actions"
-<<<<<<< HEAD
-        :key="i"
-      >
-=======
         :key="i">
->>>>>>> upstream/master
         <button
           type="button"
           class="js-manual-action-link no-btn btn"

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

@@ -3,21 +3,6 @@
   import { s__ } from '../../locale';
 
   /**
-<<<<<<< HEAD
-   * Renders the external url link in environments table.
-   */
-  export default {
-    directives: {
-      tooltip,
-    },
-
-    props: {
-      externalUrl: {
-        type: String,
-        required: true,
-      },
-    },
-=======
   * Renders the external url link in environments table.
   */
   export default {
@@ -30,7 +15,6 @@
         required: true,
       },
     },
->>>>>>> upstream/master
 
     computed: {
       title() {

app/assets/javascripts/groups/components/app.vue

@@ -56,11 +56,7 @@ export default {
 
     eventHub.$on('fetchPage', this.fetchPage);
     eventHub.$on('toggleChildren', this.toggleChildren);
-<<<<<<< HEAD
-    eventHub.$on('leaveGroup', this.leaveGroup);
-=======
     eventHub.$on('showLeaveGroupModal', this.showLeaveGroupModal);
->>>>>>> upstream/master
     eventHub.$on('updatePagination', this.updatePagination);
     eventHub.$on('updateGroups', this.updateGroups);
   },
@@ -70,11 +66,7 @@ export default {
   beforeDestroy() {
     eventHub.$off('fetchPage', this.fetchPage);
     eventHub.$off('toggleChildren', this.toggleChildren);
-<<<<<<< HEAD
-    eventHub.$off('leaveGroup', this.leaveGroup);
-=======
     eventHub.$off('showLeaveGroupModal', this.showLeaveGroupModal);
->>>>>>> upstream/master
     eventHub.$off('updatePagination', this.updatePagination);
     eventHub.$off('updateGroups', this.updateGroups);
   },

app/assets/javascripts/groups/components/item_actions.vue

 <script>
-<<<<<<< HEAD
-  import { s__ } from '~/locale';
-  import tooltip from '~/vue_shared/directives/tooltip';
-  import icon from '~/vue_shared/components/icon.vue';
-  import modal from '~/vue_shared/components/modal.vue';
-  import eventHub from '../event_hub';
-  import { COMMON_STR } from '../constants';
-
-  export default {
-    components: {
-      icon,
-      modal,
-=======
 import tooltip from '~/vue_shared/directives/tooltip';
 import icon from '~/vue_shared/components/icon.vue';
 import eventHub from '../event_hub';
@@ -24,17 +11,6 @@ export default {
   directives: {
     tooltip,
   },
-  props: {
-    parentGroup: {
-      type: Object,
-      required: false,
-      default: () => ({}),
->>>>>>> upstream/master
-    },
-    directives: {
-      tooltip,
-    },
-<<<<<<< HEAD
   props: {
     parentGroup: {
       type: Object,
@@ -45,19 +21,7 @@ export default {
       type: Object,
       required: true,
     },
-=======
   },
-  computed: {
-    leaveBtnTitle() {
-      return COMMON_STR.LEAVE_BTN_TITLE;
->>>>>>> upstream/master
-    },
-    data() {
-      return {
-        modalStatus: false,
-      };
-    },
-<<<<<<< HEAD
   computed: {
     leaveBtnTitle() {
       return COMMON_STR.LEAVE_BTN_TITLE;
@@ -65,21 +29,6 @@ export default {
     editBtnTitle() {
       return COMMON_STR.EDIT_BTN_TITLE;
     },
-      leaveConfirmationMessage() {
-        return s__(`GroupsTree|Are you sure you want to leave the "${this.group.fullName}" group?`);
-      },
-    },
-    methods: {
-      onLeaveGroup() {
-        this.modalStatus = true;
-      },
-      leaveGroup() {
-        this.modalStatus = false;
-        eventHub.$emit('leaveGroup', this.group, this.parentGroup);
-      },
-    },
-  };
-=======
   },
   methods: {
     onLeaveGroup() {
@@ -87,7 +36,6 @@ export default {
     },
   },
 };
->>>>>>> upstream/master
 </script>
 
 <template>

app/assets/javascripts/groups/components/item_stats_value.vue

@@ -30,19 +30,11 @@
         default: 'bottom',
       },
       /**
-<<<<<<< HEAD
        * value could either be number or string
        * as `memberCount` is always passed as string
        * while `subgroupCount` & `projectCount`
        * are always number
        */
-=======
-      * value could either be number or string
-      * as `memberCount` is always passed as string
-      * while `subgroupCount` & `projectCount`
-      * are always number
-      */
->>>>>>> upstream/master
       value: {
         type: [Number, String],
         required: false,