From 13d4231eb9f577456b420ff5044c55584add9b39 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 6 Jun 2016 16:46:18 +0200 Subject: Use `@ci_commit` in merge_request_controller --- app/controllers/projects/merge_requests_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 0de34420883..e96e816bcd7 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -317,8 +317,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request_diff = @merge_request.merge_request_diff - @pipeline = @merge_request.pipeline - @statuses = @pipeline.statuses if @pipeline + @ci_commit = @merge_request.pipeline + @statuses = @ci_commit.statuses if @ci_commit if @merge_request.locked_long_ago? @merge_request.unlock_mr @@ -327,8 +327,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def define_widget_vars - @pipeline = @merge_request.pipeline - @pipelines = [@pipeline].compact + @ci_commit = @merge_request.pipeline + @ci_commits = [@ci_commit].compact closes_issues end -- cgit v1.2.1