summaryrefslogtreecommitdiff
path: root/app/helpers/merge_requests_helper.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-06-25 16:21:13 +0900
committerShinya Maeda <shinya@gitlab.com>2018-06-25 16:21:13 +0900
commit6c3eea0db04be446a1daebf629b6ddf9e0f18d18 (patch)
tree7de3db2d1addf9ea8e018817c1b8de378d33fb9d /app/helpers/merge_requests_helper.rb
parent24ba0989878a363c37d86758844a17a99fc7ae0c (diff)
parent2bac2918b2d6f12d94f739f4b6865b9e9221c642 (diff)
downloadgitlab-ce-6c3eea0db04be446a1daebf629b6ddf9e0f18d18.tar.gz
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
-rw-r--r--app/helpers/merge_requests_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 5ff06b3e0fc..82a7931c557 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -86,6 +86,8 @@ module MergeRequestsHelper
end
def version_index(merge_request_diff)
+ return nil if @merge_request_diffs.empty?
+
@merge_request_diffs.size - @merge_request_diffs.index(merge_request_diff)
end