diff options
| author | Phil Hughes <me@iamphill.com> | 2018-08-10 14:16:31 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-10 14:16:31 +0000 |
| commit | 9964b678110e97c492a8b2f77ab899252c05f10e (patch) | |
| tree | e3fe2f6858801caf332c3dc6f60d301c9194fc6f | |
| parent | f1ae7c669bcbaea41698d293f974c0e9462bf9a4 (diff) | |
| parent | 03351199dfa793631f352201d2dba15162789ec1 (diff) | |
| download | gitlab-ce-9964b678110e97c492a8b2f77ab899252c05f10e.tar.gz | |
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
3 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/reports/components/issues_list.vue b/app/assets/javascripts/reports/components/issues_list.vue index dbb8848d1fa..df42201b5de 100644 --- a/app/assets/javascripts/reports/components/issues_list.vue +++ b/app/assets/javascripts/reports/components/issues_list.vue @@ -1,10 +1,10 @@ <script> -import IssuesBlock from './report_issues.vue'; +import IssuesBlock from '~/reports/components/report_issues.vue'; import { STATUS_SUCCESS, STATUS_FAILED, STATUS_NEUTRAL, -} from '../constants'; +} from '~/reports/constants'; /** * Renders block of issues diff --git a/app/assets/javascripts/reports/components/report_issues.vue b/app/assets/javascripts/reports/components/report_issues.vue index 884f55c8dec..c553a374f66 100644 --- a/app/assets/javascripts/reports/components/report_issues.vue +++ b/app/assets/javascripts/reports/components/report_issues.vue @@ -1,6 +1,6 @@ <script> -import IssueStatusIcon from './issue_status_icon.vue'; -import { components, componentNames } from './issue_body'; +import IssueStatusIcon from '~/reports/components/issue_status_icon.vue'; +import { components, componentNames } from '~/reports/components/issue_body'; export default { name: 'ReportIssues', diff --git a/changelogs/unreleased/fl-reduce-ee-conflicts-reports-code.yml b/changelogs/unreleased/fl-reduce-ee-conflicts-reports-code.yml new file mode 100644 index 00000000000..068681dfe19 --- /dev/null +++ b/changelogs/unreleased/fl-reduce-ee-conflicts-reports-code.yml @@ -0,0 +1,5 @@ +--- +title: Reduce differences between CE and EE code base in reports components +merge_request: +author: +type: other |