Add Pipelines for Commit
This commit is contained in:
parent
4d4506ad6e
commit
5e5f6af869
|
|
@ -10,10 +10,11 @@ class Projects::CommitController < Projects::ApplicationController
|
|||
before_action :require_non_empty_project
|
||||
before_action :authorize_download_code!, except: [:cancel_builds, :retry_builds]
|
||||
before_action :authorize_update_build!, only: [:cancel_builds, :retry_builds]
|
||||
before_action :authorize_read_pipeline!, only: [:pipelines]
|
||||
before_action :authorize_read_commit_status!, only: [:builds]
|
||||
before_action :commit
|
||||
before_action :define_commit_vars, only: [:show, :diff_for_path, :builds]
|
||||
before_action :define_status_vars, only: [:show, :builds]
|
||||
before_action :define_commit_vars, only: [:show, :diff_for_path, :builds, :pipelines]
|
||||
before_action :define_status_vars, only: [:show, :builds, :pipelines]
|
||||
before_action :define_note_vars, only: [:show, :diff_for_path]
|
||||
before_action :authorize_edit_tree!, only: [:revert, :cherry_pick]
|
||||
|
||||
|
|
@ -31,6 +32,9 @@ class Projects::CommitController < Projects::ApplicationController
|
|||
render_diff_for_path(@commit.diffs(diff_options))
|
||||
end
|
||||
|
||||
def pipelines
|
||||
end
|
||||
|
||||
def builds
|
||||
end
|
||||
|
||||
|
|
@ -96,10 +100,6 @@ class Projects::CommitController < Projects::ApplicationController
|
|||
@noteable = @commit ||= @project.commit(params[:id])
|
||||
end
|
||||
|
||||
def pipelines
|
||||
@pipelines ||= project.pipelines.where(sha: commit.sha)
|
||||
end
|
||||
|
||||
def ci_builds
|
||||
@ci_builds ||= Ci::Build.where(pipeline: pipelines)
|
||||
end
|
||||
|
|
@ -134,8 +134,9 @@ class Projects::CommitController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def define_status_vars
|
||||
@statuses = CommitStatus.where(pipeline: pipelines).relevant
|
||||
@builds = Ci::Build.where(pipeline: pipelines).relevant
|
||||
@ci_pipelines = project.pipelines.where(sha: commit.sha)
|
||||
@statuses = CommitStatus.where(pipeline: @ci_pipelines).relevant
|
||||
@builds = Ci::Build.where(pipeline: @ci_pipelines).relevant
|
||||
end
|
||||
|
||||
def assign_change_commit_vars(mr_source_branch)
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
- @pipelines.each do |pipeline|
|
||||
- @ci_pipelines.each do |pipeline|
|
||||
= render "pipeline", pipeline: pipeline, pipeline_details: true
|
||||
|
|
|
|||
|
|
@ -7,3 +7,8 @@
|
|||
= link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id) do
|
||||
Builds
|
||||
%span.badge= @statuses.count
|
||||
- if can?(current_user, :read_pipeline, @project)
|
||||
= nav_link(path: 'commit#pipelines') do
|
||||
= link_to pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id) do
|
||||
Pipelines
|
||||
%span.badge= @ci_pipelines.count
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
- page_title "Pipelines", "#{@commit.title} (#{@commit.short_id})", "Commits"
|
||||
|
||||
.prepend-top-default
|
||||
= render "commit_box"
|
||||
|
||||
= render "ci_menu"
|
||||
= render "pipelines_list", pipelines: @ci_pipelines
|
||||
|
|
@ -635,6 +635,7 @@ Rails.application.routes.draw do
|
|||
member do
|
||||
get :branches
|
||||
get :builds
|
||||
get :pipelines
|
||||
post :cancel_builds
|
||||
post :retry_builds
|
||||
post :revert
|
||||
|
|
|
|||
Loading…
Reference in New Issue