diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-03-31 19:51:28 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-11 23:32:54 +0200 |
commit | 5d69f5b46d475f34fb71dfb4e8b683e90897f1da (patch) | |
tree | 48f268cb483ecab1d8d7e042c60931596838b1a3 /app/controllers/projects/commit_controller.rb | |
parent | 986b4a54ee159de56a7ebe51327887b49474813b (diff) | |
download | gitlab-ce-5d69f5b46d475f34fb71dfb4e8b683e90897f1da.tar.gz |
Use Ci::Commit as Pipeline
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
-rw-r--r-- | app/controllers/projects/commit_controller.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 576fa3cedb2..f9a4aeaa627 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -94,8 +94,8 @@ class Projects::CommitController < Projects::ApplicationController @commit ||= @project.commit(params[:id]) end - def ci_commit - @ci_commit ||= project.ci_commit(commit.sha) + def ci_commits + @ci_commits ||= project.ci_commits.where(sha: commit.sha) end def define_show_vars @@ -108,7 +108,8 @@ class Projects::CommitController < Projects::ApplicationController @diff_refs = [commit.parent || commit, commit] @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 def assign_revert_commit_vars |