diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-18 07:53:34 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-18 07:53:34 +0000 |
| commit | c5d8e7fcee6bb15376902e8f1336f1ed368b9da8 (patch) | |
| tree | c8113232b0d37abb22815c51c563d24d2300004b /app/assets | |
| parent | 7653f671eedd0476b8141529635eb825c132987e (diff) | |
| parent | d1fe07a2e5aeaa29d191eeab130335876fd07f85 (diff) | |
| download | gitlab-ce-c5d8e7fcee6bb15376902e8f1336f1ed368b9da8.tar.gz | |
Merge branch '51386-broken-border-reports' into 'master'
Fixes broken borders in reports section MR widget
Closes #51386
See merge request gitlab-org/gitlab-ce!22416
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/reports/components/grouped_test_reports_app.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 11 |
2 files changed, 7 insertions, 6 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 fb8c6402d02..b373d83a44b 100644 --- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue +++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue @@ -82,7 +82,7 @@ :loading-text="groupedSummaryText" :error-text="groupedSummaryText" :has-issues="reports.length > 0" - class="mr-widget-border-top grouped-security-reports mr-report" + class="mr-widget-section grouped-security-reports mr-report" > <div slot="body" diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 7ac3fedb2e3..a599cc002d6 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -275,12 +275,13 @@ export default { :key="deployment.id" :deployment="deployment" /> - <grouped-test-reports-app - v-if="mr.testResultsPath" - class="js-reports-container" - :endpoint="mr.testResultsPath" - /> <div class="mr-section-container"> + <grouped-test-reports-app + v-if="mr.testResultsPath" + class="js-reports-container" + :endpoint="mr.testResultsPath" + /> + <div class="mr-widget-section"> <component :is="componentName" |