diff options
4 files changed, 0 insertions, 62 deletions
diff --git a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue index d222f6bc930..89ee7126cb8 100644 --- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue +++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue @@ -40,11 +40,7 @@ return s__('Reports|Test summary results are being parsed'); } -<<<<<<< HEAD if (this.hasError || !this.summaryCounts) { -======= - if (this) { ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd return s__('Reports|Test summary failed loading results'); } diff --git a/app/assets/javascripts/reports/components/modal.vue b/app/assets/javascripts/reports/components/modal.vue index d51d31f042e..6b49d0b832e 100644 --- a/app/assets/javascripts/reports/components/modal.vue +++ b/app/assets/javascripts/reports/components/modal.vue @@ -31,7 +31,6 @@ this.$emit('createIssue'); }, }, -<<<<<<< HEAD computed: { shouldRenderFooterSection() { return this.canCreateIssuePermission; @@ -41,19 +40,13 @@ return false; }, } -======= ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd }; </script> <template> <modal id="modal-mrwidget-reports" :header-title-text="title" -<<<<<<< HEAD :class="{ 'modal-hide-footer': !shouldRenderFooterSection }" -======= - :class="{ 'modal-hide-footer': false }" ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd class="modal-security-report-dast" > <slot> @@ -93,7 +86,6 @@ </div> </slot> <div slot="footer"> -<<<<<<< HEAD <template v-if="shouldRenderFooterSection"> <button type="button" @@ -112,24 +104,6 @@ @click="handleCreateIssueClick" /> </template> -======= - <button - type="button" - class="btn btn-default" - data-dismiss="modal" - > - {{ __('Cancel' ) }} - </button> - - <loading-button - v-if="canCreateIssuePermission" - :loading="isCreatingNewIssue" - :disabled="isCreatingNewIssue" - :label="__('Create issue')" - container-class="js-create-issue-btn btn btn-success btn-inverted" - @click="handleCreateIssueClick" - /> ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd </div> </modal> </template> diff --git a/app/assets/javascripts/reports/store/mutations.js b/app/assets/javascripts/reports/store/mutations.js index 055b01562c3..6068ef49975 100644 --- a/app/assets/javascripts/reports/store/mutations.js +++ b/app/assets/javascripts/reports/store/mutations.js @@ -1,8 +1,4 @@ /* eslint-disable no-param-reassign */ -<<<<<<< HEAD -======= -import Vue from 'vue'; ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd import * as types from './mutation_types'; export default { @@ -16,15 +12,9 @@ export default { state.isLoading = false; -<<<<<<< HEAD state.summary.total = response.summary.total; state.summary.resolved = response.summary.resolved; state.summary.failed = response.summary.failed; -======= - Vue.set(state.summary, 'total', response.summary.total); - Vue.set(state.summary, 'resolved', response.summary.resolved); - Vue.set(state.summary, 'failed', response.summary.failed); ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd state.status = response.status; state.reports = response.suites; @@ -35,7 +25,6 @@ export default { state.hasError = true; }, [types.SET_ISSUE_MODAL_DATA](state, payload) { -<<<<<<< HEAD state.modal.title = payload.issue.name; state.modal.status = payload.status; @@ -45,19 +34,10 @@ export default { ...state.modal.data[key], value: payload.issue[key] } -======= - Vue.set(state.modal, 'title', payload.issue.name); - Vue.set(state.modal, 'status', payload.status); - - Object.keys(payload.issue).forEach((key) => { - if (Object.prototype.hasOwnProperty.call(state.modal.data, key)) { - Vue.set(state.modal.data[key], 'value', payload.issue[key]); ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd } }); }, [types.REQUEST_CREATE_ISSUE](state) { -<<<<<<< HEAD state.modal.isLoading = true; }, [types.RECEIVE_CREATE_ISSUE_SUCCESS](state) { @@ -65,14 +45,5 @@ export default { }, [types.RECEIVE_CREATE_ISSUE_ERROR](state) { state.modal.isLoading = false; -======= - Vue.set(state.modal, 'isLoading', true); - }, - [types.RECEIVE_CREATE_ISSUE_SUCCESS](state) { - Vue.set(state.modal, 'isLoading', false); - }, - [types.RECEIVE_CREATE_ISSUE_ERROR](state) { - Vue.set(state.modal, 'isLoading', false); ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd }, }; diff --git a/app/assets/javascripts/reports/store/state.js b/app/assets/javascripts/reports/store/state.js index 71300137fe7..02197fbb97a 100644 --- a/app/assets/javascripts/reports/store/state.js +++ b/app/assets/javascripts/reports/store/state.js @@ -37,10 +37,7 @@ export default () => ({ status: null, isCreatingNewIssue: false, -<<<<<<< HEAD isLoading: false, -======= ->>>>>>> 8f3b9c0d313f9eeef1b6e6b5eccf622156e960bd hasError: false, data: { |