[refs #579] first version of the outdated diff

This commit is contained in:
Alexander Machehin 2012-10-16 00:14:43 +06:00
parent 8d4311e419
commit cef112efc3
3 changed files with 13 additions and 3 deletions

View File

@ -10,6 +10,14 @@
-elsif item.is_a? Array
=render 'projects/git/commits/commits_small', :commits => commits_queue if commits_queue.present?
-commits_queue.clear
=render 'projects/pull_requests/discussion_comments', :item => item, :add_id => nil
-unless item[1].first.data[:actual]
-exp_id = "expand-comment#{item[1].first.id}"
.activity
=t '.show_outdated_diff'
%span.data-expander.collapsed{:id => exp_id}  
.hidden{:id => "content-#{exp_id}"}
=render 'projects/pull_requests/discussion_comments', :item => item, :add_id => nil
-else
=render 'projects/pull_requests/discussion_comments', :item => item, :add_id => nil
=render 'projects/git/commits/commits_small', :commits => commits_queue if commits_queue.present?

View File

@ -28,7 +28,8 @@ en:
ready: Ready
merged: Merged
closed: Closed
activity:
show_outdated_diff: Show outdated_diff
pull_requests:
tabs:
discussion: Discussion

View File

@ -30,7 +30,8 @@ ru:
ready: Готов к мержу
merged: Смержен
closed: Закрыт
activity:
show_outdated_diff: Отобразить устаревшие изменения
pull_requests:
tabs:
discussion: Дискуссия