diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 06:09:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 06:09:14 +0000 |
commit | 42f41de46525ce0065f02ee07c1a79f5669526a0 (patch) | |
tree | 6e8151aae2628d2c2ce8942be1ba547afe0264b2 /app | |
parent | 1eeef229aae5affdce415c2364858e8efc64f4b5 (diff) | |
download | gitlab-ce-42f41de46525ce0065f02ee07c1a79f5669526a0.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 8 | ||||
-rw-r--r-- | app/views/projects/imports/show.html.haml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index ff65f040335..af512ac6f07 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -172,9 +172,15 @@ class Projects::PipelinesController < Projects::ApplicationController if pipeline_test_report == :error render json: { status: :error_parsing_report } else + test_reports = if params[:scope] == "with_attachment" + pipeline_test_report.with_attachment! + else + pipeline_test_report + end + render json: TestReportSerializer .new(current_user: @current_user) - .represent(pipeline_test_report) + .represent(test_reports) end end end diff --git a/app/views/projects/imports/show.html.haml b/app/views/projects/imports/show.html.haml index 87b027a1802..09624b771ea 100644 --- a/app/views/projects/imports/show.html.haml +++ b/app/views/projects/imports/show.html.haml @@ -4,7 +4,7 @@ .save-project-loader .center %h2 - %i.fa.fa-spinner.fa-spin + %i.loading.spinner.spinner-sm = import_in_progress_title - if !has_ci_cd_only_params? && @project.external_import? %p.monospace git clone --bare #{@project.safe_import_url} |