summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-07 13:19:15 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-07 13:19:15 +0200
commitb0eb4cb4a73d78b45cc86b3714d7493484b2b5e7 (patch)
tree95c793fb6f73d504a242ae4407c009cd10d361d3 /app/controllers
parent93eb844d7e9c74988df84f5fa76316026e4b39c9 (diff)
downloadgitlab-ce-b0eb4cb4a73d78b45cc86b3714d7493484b2b5e7.tar.gz
Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3
Diffstat (limited to 'app/controllers')
-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 e96e816bcd7..0de34420883 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
- @ci_commit = @merge_request.pipeline
- @statuses = @ci_commit.statuses if @ci_commit
+ @pipeline = @merge_request.pipeline
+ @statuses = @pipeline.statuses if @pipeline
if @merge_request.locked_long_ago?
@merge_request.unlock_mr
@@ -327,8 +327,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def define_widget_vars
- @ci_commit = @merge_request.pipeline
- @ci_commits = [@ci_commit].compact
+ @pipeline = @merge_request.pipeline
+ @pipelines = [@pipeline].compact
closes_issues
end