diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/controllers/projects/ci | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/controllers/projects/ci')
-rw-r--r-- | app/controllers/projects/ci/daily_build_group_report_results_controller.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/projects/ci/daily_build_group_report_results_controller.rb b/app/controllers/projects/ci/daily_build_group_report_results_controller.rb index dfda5fca310..b36c5f1aea6 100644 --- a/app/controllers/projects/ci/daily_build_group_report_results_controller.rb +++ b/app/controllers/projects/ci/daily_build_group_report_results_controller.rb @@ -7,12 +7,13 @@ class Projects::Ci::DailyBuildGroupReportResultsController < Projects::Applicati REPORT_WINDOW = 90.days before_action :validate_feature_flag! - before_action :authorize_download_code! # Share the same authorization rules as the graphs controller + before_action :authorize_read_build_report_results! before_action :validate_param_type! def index respond_to do |format| - format.csv { send_data(render_csv(results), type: 'text/csv; charset=utf-8') } + format.csv { send_data(render_csv(report_results), type: 'text/csv; charset=utf-8') } + format.json { render json: render_json(report_results) } end end @@ -37,7 +38,11 @@ class Projects::Ci::DailyBuildGroupReportResultsController < Projects::Applicati ).render end - def results + def render_json(collection) + Ci::DailyBuildGroupReportResultSerializer.new.represent(collection, param_type: param_type) + end + + def report_results Ci::DailyBuildGroupReportResultsFinder.new(finder_params).execute end |