deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1026 from gitlabhq/inline_diff

Browse source 
Inline diff
This commit is contained in:
Dmitriy Zaporozhets 2012-07-04 22:45:52 -07:00
commit 4e0c2f00d3
3 changed files with 83 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/sections/commits.scss
View file

@ -82,6 +82,17 @@
color:#333;
font-size: 12px;
font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
.old{
span.idiff{
background-color:#FAA;
}
}
.new{
span.idiff{
background-color:#AFA;
}
}
}
.diff_file_content_image {
background:#eee;

6
app/helpers/commits_helper.rb
View file

@ -35,8 +35,8 @@ module CommitsHelper
line_old = 1
line_new = 1
type = nil
lines_arr = diff_arr
lines_arr = ::Gitlab::InlineDiff.processing diff_arr
lines_arr.each do |line|
next if line.match(/^\-\-\- \/dev\/null/)
next if line.match(/^\+\+\+ \/dev\/null/)
@ -44,6 +44,7 @@ module CommitsHelper
next if line.match(/^\+\+\+ b/)
full_line = html_escape(line.gsub(/\n/, ''))
full_line = ::Gitlab::InlineDiff.replace_markers full_line
if line.match(/^@@ -/)
type = "match"
@ -81,4 +82,5 @@ module CommitsHelper
nil
end
end
end