diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-01 13:34:23 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-01 13:34:23 +0300 |
| commit | 7f47e13218477c13cc627c2f0664500b72ea18b7 (patch) | |
| tree | 077f08ada085795dab3a4ecbcfa0436d67642977 /lib/gitlab/diff | |
| parent | 1c50200b9aba86d2ba66b81dee7886a51dc38409 (diff) | |
| parent | 733ae9492129e835f183902a97ee0886e2dbdc9b (diff) | |
Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'
Fix typos in comments and specs
See merge request gitlab-org/gitlab-ce!22683
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/position_tracer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/position_tracer.rb b/lib/gitlab/diff/position_tracer.rb index b68a1636814..8457e0c4cb6 100644 --- a/lib/gitlab/diff/position_tracer.rb +++ b/lib/gitlab/diff/position_tracer.rb @@ -24,7 +24,7 @@ module Gitlab # head of `feature` was commit B, resulting in the original diff A->B. # Since creation, `master` was updated to C. # Now `feature` is being updated to D, and the newly generated MR diff is C->D. - # It is possible that C and D are direct decendants of A and B respectively, + # It is possible that C and D are direct descendants of A and B respectively, # but this isn't necessarily the case as rebases and merges come into play. # # Suppose we have a diff note on the original diff A->B. Now that the MR |