Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

d27db3ea

Commit d27db3ea authored 7 years ago by Sean McGivern

Downloads
- Plain Diff

Merge branch 'dm-diff-file-straight-diff' into 'master'

Fix Diff::Position#diff_file for positions on straight diffs

See merge request !11947

parents 5c26f471 3a5d375e

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/services/compare_service.rb 3 additions, 3 deletions

app/services/compare_service.rb
lib/gitlab/diff/diff_refs.rb 10 additions, 0 deletions

lib/gitlab/diff/diff_refs.rb
lib/gitlab/diff/position.rb 2 additions, 16 deletions

lib/gitlab/diff/position.rb
lib/gitlab/diff/position_tracer.rb 1 addition, 1 deletion

lib/gitlab/diff/position_tracer.rb
lib/gitlab/git/compare.rb 1 addition, 1 deletion

lib/gitlab/git/compare.rb
spec/lib/gitlab/diff/diff_refs_spec.rb 61 additions, 0 deletions

spec/lib/gitlab/diff/diff_refs_spec.rb
spec/lib/gitlab/diff/position_spec.rb 48 additions, 0 deletions

spec/lib/gitlab/diff/position_spec.rb
spec/lib/gitlab/git/compare_spec.rb 2 additions, 2 deletions

spec/lib/gitlab/git/compare_spec.rb

with 128 additions and 23 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment