diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-16 18:58:23 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-23 15:37:43 -0500 |
commit | 68f7fd8b7840fc6b4160db51382fd09e673d2501 (patch) | |
tree | 58b4a93736822d14bd103c223f510d8664ffb017 /app | |
parent | bc4fec1fcbf848bec682b59f2f47b1648eee9b44 (diff) | |
download | gitlab-ce-68f7fd8b7840fc6b4160db51382fd09e673d2501.tar.gz |
Change code comment formattingdm-diff-cleanup
Diffstat (limited to 'app')
-rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |