summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-06 16:46:18 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-06 16:46:18 +0200
commit13d4231eb9f577456b420ff5044c55584add9b39 (patch)
treee7ffbb2311fb1a0a4ea3f39f59efe7a159a18b05
parentd9b292f8726e46050e2d882a9a9fc1be95007d18 (diff)
downloadgitlab-ce-13d4231eb9f577456b420ff5044c55584add9b39.tar.gz
Use `@ci_commit` in merge_request_controller
-rw-r--r--app/controllers/projects/merge_requests_controller.rb8
1 files 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