Commit 9964b678 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'fl-reduce-ee-conflicts-reports-code' into 'master'

Reduce differences between CE and EE code base in reports components

See merge request gitlab-org/gitlab-ce!21128
parents f1ae7c66 03351199
<script> <script>
import IssuesBlock from './report_issues.vue'; import IssuesBlock from '~/reports/components/report_issues.vue';
import { import {
STATUS_SUCCESS, STATUS_SUCCESS,
STATUS_FAILED, STATUS_FAILED,
STATUS_NEUTRAL, STATUS_NEUTRAL,
} from '../constants'; } from '~/reports/constants';
/** /**
* Renders block of issues * Renders block of issues
......
<script> <script>
import IssueStatusIcon from './issue_status_icon.vue'; import IssueStatusIcon from '~/reports/components/issue_status_icon.vue';
import { components, componentNames } from './issue_body'; import { components, componentNames } from '~/reports/components/issue_body';
export default { export default {
name: 'ReportIssues', name: 'ReportIssues',
......
---
title: Reduce differences between CE and EE code base in reports components
merge_request:
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment