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

8dfad143

Commit 8dfad143 authored 9 years ago by Douwe Maan

Downloads
- Patches
- Plain Diff

Add inline diff markers in highlighted diffs.

parent 83e4fc18

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/projects/blob_controller.rb 1 addition, 1 deletion

app/controllers/projects/blob_controller.rb
app/views/projects/diffs/_parallel_view.html.haml 2 additions, 2 deletions

app/views/projects/diffs/_parallel_view.html.haml
app/views/projects/diffs/_text_file.html.haml 1 addition, 1 deletion

app/views/projects/diffs/_text_file.html.haml
lib/gitlab/diff/file.rb 1 addition, 1 deletion

lib/gitlab/diff/file.rb
lib/gitlab/diff/highlight.rb 173 additions, 33 deletions

lib/gitlab/diff/highlight.rb
lib/gitlab/highlight.rb 7 additions, 0 deletions

lib/gitlab/highlight.rb
spec/lib/gitlab/diff/highlight_spec.rb 2 additions, 2 deletions

spec/lib/gitlab/diff/highlight_spec.rb

with 187 additions and 40 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