Skip to content
Snippets Groups Projects

Ci::Commit becomes a Pipeline object

Merged Kamil Trzcińśki requested to merge ci-commit-as-pipeline into master
53 files
+ 646
473
Compare changes
  • Side-by-side
  • Inline
Files
53
@@ -38,13 +38,13 @@ class Projects::CommitController < Projects::ApplicationController
@@ -38,13 +38,13 @@ class Projects::CommitController < Projects::ApplicationController
end
end
def cancel_builds
def cancel_builds
ci_commit.builds.running_or_pending.each(&:cancel)
ci_builds.running_or_pending.each(&:cancel)
redirect_back_or_default default: builds_namespace_project_commit_path(project.namespace, project, commit.sha)
redirect_back_or_default default: builds_namespace_project_commit_path(project.namespace, project, commit.sha)
end
end
def retry_builds
def retry_builds
ci_commit.builds.latest.failed.each do |build|
ci_builds.latest.failed.each do |build|
if build.retryable?
if build.retryable?
Ci::Build.retry(build)
Ci::Build.retry(build)
end
end
@@ -94,8 +94,12 @@ class Projects::CommitController < Projects::ApplicationController
@@ -94,8 +94,12 @@ class Projects::CommitController < Projects::ApplicationController
@commit ||= @project.commit(params[:id])
@commit ||= @project.commit(params[:id])
end
end
def ci_commit
def ci_commits
@ci_commit ||= project.ci_commit(commit.sha)
@ci_commits ||= project.ci_commits.where(sha: commit.sha)
 
end
 
 
def ci_builds
 
@ci_builds ||= Ci::Build.where(commit: ci_commits)
end
end
def define_show_vars
def define_show_vars
@@ -108,7 +112,8 @@ class Projects::CommitController < Projects::ApplicationController
@@ -108,7 +112,8 @@ class Projects::CommitController < Projects::ApplicationController
@diff_refs = [commit.parent || commit, commit]
@diff_refs = [commit.parent || commit, commit]
@notes_count = commit.notes.count
@notes_count = commit.notes.count
@statuses = ci_commit.statuses if ci_commit
@statuses = CommitStatus.where(commit: ci_commits)
 
@builds = Ci::Build.where(commit: ci_commits)
end
end
def assign_revert_commit_vars
def assign_revert_commit_vars
Loading