BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
228d2a4c
Commit
228d2a4c
authored
Jul 06, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some more code comments.
parent
d9c75aec
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
3 deletions
+20
-3
note_on_diff.rb
app/models/concerns/note_on_diff.rb
+1
-0
merge_request.rb
app/models/merge_request.rb
+3
-2
diff_refs.rb
lib/gitlab/diff/diff_refs.rb
+10
-0
line_mapper.rb
lib/gitlab/diff/line_mapper.rb
+1
-1
position.rb
lib/gitlab/diff/position.rb
+5
-0
No files found.
app/models/concerns/note_on_diff.rb
View file @
228d2a4c
...
...
@@ -31,6 +31,7 @@ module NoteOnDiff
false
end
# Returns an array of at most 16 highlighted lines above a diff note
def
truncated_diff_lines
prev_match_line
=
nil
prev_lines
=
[]
...
...
app/models/merge_request.rb
View file @
228d2a4c
...
...
@@ -186,8 +186,9 @@ class MergeRequest < ActiveRecord::Base
# This will not be the actual base commit 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 use in Gitlab::Git::DiffRefs, which need the
# true base commit.
# It is not good enough for use in `Gitlab::Git::DiffRefs`, which needs the
# true base commit, so we can't simply have `#diff_base_commit` fall back on
# this method.
def
likely_diff_base_commit
first_commit
.
parent
||
first_commit
end
...
...
lib/gitlab/diff/diff_refs.rb
View file @
228d2a4c
...
...
@@ -18,6 +18,16 @@ module Gitlab
head_sha
==
other
.
head_sha
end
# There is only one case in which we will have `start_sha` and `head_sha`,
# but not `base_sha`, which is when a diff is generated between an
# orphaned branch and another branch, which means there _is_ no base, but
# we're still able to highlight it, and to create diff notes, which are
# the primary things `DiffRefs` are used for.
# `DiffRefs` are "complete" when they have `start_sha` and `head_sha`,
# because `base_sha` can always be derived from this, to return an actual
# sha, or `nil`.
# We have `base_sha` directly available on `DiffRefs` because it's faster#
# than having to look it up in the repo every time.
def
complete?
start_sha
&&
head_sha
end
...
...
lib/gitlab/diff/line_mapper.rb
View file @
228d2a4c
...
...
@@ -26,7 +26,7 @@ module Gitlab
@diff_lines
||=
@diff_file
.
diff_lines
end
# Find old
line number based on new
line number.
# Find old
/new line number based on its old/new counterpart
line number.
def
map_line_number
(
from_line
,
from
:,
to
:)
# If no diff file could be found, the file wasn't changed, and the
# mapped line number is the same as the specified line number.
...
...
lib/gitlab/diff/position.rb
View file @
228d2a4c
...
...
@@ -28,6 +28,11 @@ module Gitlab
end
end
# `Gitlab::Diff::Position` objects are stored as serialized attributes in
# `DiffNote`, which use YAML to encode and decode objects.
# `#init_with` and `#encode_with` can be used to customize the en/decoding
# behavior. In this case, we override these to prevent memoized instance
# variables like `@diff_file` and `@diff_line` from being serialized.
def
init_with
(
coder
)
initialize
(
coder
[
'attributes'
])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment