From 68f7fd8b7840fc6b4160db51382fd09e673d2501 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 16 May 2017 18:58:23 -0500 Subject: Change code comment formatting --- app/models/merge_request_diff.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/models/merge_request_diff.rb') diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 6d6c561976c..b2abd280879 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -152,10 +152,12 @@ class MergeRequestDiff < ActiveRecord::Base # MRs created before 8.4 don't store their true diff refs (start and base), # but we need to get a commit SHA for the "View file @ ..." link by a file, - # so we find use an approximation of the diff refs if we can't get the actual one. + # so we use an approximation of the diff refs if we can't get the actual one. + # # These will not be the actual diff refs if the target branch was merged into # the source branch after the merge request was created, but it is good enough # for the specific purpose of linking to a commit. + # # It is not good enough for highlighting diffs, so we can't simply pass # these as `diff_refs.` def fallback_diff_refs -- cgit v1.2.3