diff view mangled

Created by: mmoll

Hi, I'm using gitlab 4.2 from the unofficial Debian packages and am encountering a problem with commit mmoll/difftest@18daeeafd - see screenshot:

Created by: senny

maybe related to #1494 (closed).

Is this still a problem with GitLab 5?

By Administrator on 2013-04-24T05:56:12 (imported from GitLab project)

By Administrator on 2013-04-24T05:56:12 (imported from GitLab)

Created by: mmoll

@senny it's still the same on GitLab 5.1

By Administrator on 2013-04-25T12:54:54 (imported from GitLab project)

By Administrator on 2013-04-25T12:54:54 (imported from GitLab)

Created by: bbodenmiller

What specifically is the issue in the screenshot? I'm not seeing it.

By Administrator on 2013-05-19T14:47:13 (imported from GitLab project)

By Administrator on 2013-05-19T14:47:13 (imported from GitLab)

Created by: mmoll

@bbodenmiller: have a look at it and compare it to the real diff:

diff --git a/test.pp b/test.pp
index 3572a94..3e7d926 100644
--- a/test.pp
+++ b/test.pp
@@ -1,5 +1,5 @@
 nrpe::command {
   'check_disk_git': cmd => 'check_disk -W 10% -K 20% 90 95 /var/lib/git/repositories';
-  'check_resque': cmd => 'check_procs -c \'1:\' -u gitlab -a \'resque-1.23.0\'';
+  'check_resque': cmd => 'check_procs -c \'1:\' -u gitlab -a \'sidekiq 2.6.4 gitlab\'';
   'check_unicorn_master': cmd => 'check_procs -c \'1:\' -u gitlab -a \'unicorn_rails master\'';
 }

By Administrator on 2013-05-19T14:52:49 (imported from GitLab project)

By Administrator on 2013-05-19T14:52:49 (imported from GitLab)

Created by: mmoll

@senny and @bbodenmiller - it's still the same on GitLab 5.2

By Administrator on 2013-05-23T12:56:35 (imported from GitLab project)

By Administrator on 2013-05-23T12:56:35 (imported from GitLab)

Created by: dzaporozhets

confirmed a problem in inline diff processing (https://github.com/gitlabhq/gitlabhq/blob/master/lib/gitlab/inline_diff.rb) I'll try to fix it for 5.3

By Administrator on 2013-06-12T13:19:25 (imported from GitLab project)

By Administrator on 2013-06-12T13:19:25 (imported from GitLab)

Created by: dzaporozhets

@mmoll can you try with referenced commit?

By Administrator on 2013-06-12T13:44:56 (imported from GitLab project)

By Administrator on 2013-06-12T13:44:56 (imported from GitLab)

Created by: mmoll

@randx yes, that works. thanks! :)

By Administrator on 2013-06-12T14:06:51 (imported from GitLab project)

By Administrator on 2013-06-12T14:06:51 (imported from GitLab)