diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 18:10:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-31 18:10:27 +0300 |
commit | 5facc34f44ce8736078127a5df174a7b52d922b4 (patch) | |
tree | b93fbe904139121e82870cc40e5ab240a97b1f08 /app/controllers | |
parent | ea1dcaef18edf97b3ac73892d64ebaf5eecd7f68 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/commit_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 18 |
2 files changed, 4 insertions, 20 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 8154128da29..0c78f239523 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -19,11 +19,6 @@ class Projects::CommitController < Projects::ApplicationController before_action :define_commit_box_vars, only: [:show, :pipelines] before_action :define_note_vars, only: [:show, :diff_for_path, :diff_files] before_action :authorize_edit_tree!, only: [:revert, :cherry_pick] - - before_action only: [:show, :pipelines] do - push_frontend_feature_flag(:ci_commit_pipeline_mini_graph_vue, @project, default_enabled: :yaml) - end - before_action do push_frontend_feature_flag(:pick_into_project) end @@ -214,7 +209,6 @@ class Projects::CommitController < Projects::ApplicationController def define_commit_box_vars @last_pipeline = @commit.last_pipeline - return unless ::Gitlab::Ci::Features.ci_commit_pipeline_mini_graph_vue_enabled?(@project) return unless @commit.last_pipeline @last_pipeline_stages = StageSerializer.new(project: @project, current_user: @current_user).represent(@last_pipeline.stages) diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 72983ac51b3..376945ef9de 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -97,7 +97,7 @@ class Projects::PipelinesController < Projects::ApplicationController Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/26657') respond_to do |format| - format.html + format.html { render_show } format.json do Gitlab::PollingInterval.set_header(response, interval: POLLING_INTERVAL) @@ -152,15 +152,6 @@ class Projects::PipelinesController < Projects::ApplicationController .represent(@stage, details: true, retried: params[:retried]) end - # TODO: This endpoint is used by mini-pipeline-graph - # TODO: This endpoint should be migrated to `stage.json` - def stage_ajax - @stage = pipeline.legacy_stage(params[:stage]) - return not_found unless @stage - - render json: { html: view_to_html_string('projects/pipelines/_stage') } - end - def retry pipeline.retry_failed(current_user) @@ -187,10 +178,7 @@ class Projects::PipelinesController < Projects::ApplicationController def test_report respond_to do |format| - format.html do - render 'show' - end - + format.html { render_show } format.json do render json: TestReportSerializer .new(current_user: @current_user) @@ -219,6 +207,8 @@ class Projects::PipelinesController < Projects::ApplicationController end def render_show + @stages = @pipeline.stages.with_latest_and_retried_statuses + respond_to do |format| format.html do render 'show' |