summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-04-13 16:32:42 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-04-13 16:32:42 +0200
commit9e68109f2d454dd05cf42a03a41a2e858e1e11bc (patch)
tree23574f6a78598a870530802f3e925c343c2c5ece /app/controllers
parent8fb976a3ff5fa05ae35cb03de6ca34e8c2139841 (diff)
downloadgitlab-ce-9e68109f2d454dd05cf42a03a41a2e858e1e11bc.tar.gz
Optimise Merge Request builds rendering
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 2fcef6c430a..4b8fc049047 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -118,7 +118,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
@ci_commit = @merge_request.ci_commit
- @ci_commits = [@ci_commit].compact
@statuses = @ci_commit.statuses if @ci_commit
@note_counts = Note.where(commit_id: @commits.map(&:id)).
@@ -311,7 +310,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request_diff = @merge_request.merge_request_diff
@ci_commit = @merge_request.ci_commit
- @ci_commits = [@ci_commit].compact
@statuses = @ci_commit.statuses if @ci_commit
if @merge_request.locked_long_ago?