[refs #579] first version of the outdated diff
This commit is contained in:
parent
8d4311e419
commit
cef112efc3
|
@ -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
|
||||
-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?
|
||||
|
||||
|
|
|
@ -28,7 +28,8 @@ en:
|
|||
ready: Ready
|
||||
merged: Merged
|
||||
closed: Closed
|
||||
|
||||
activity:
|
||||
show_outdated_diff: Show outdated_diff
|
||||
pull_requests:
|
||||
tabs:
|
||||
discussion: Discussion
|
||||
|
|
|
@ -30,7 +30,8 @@ ru:
|
|||
ready: Готов к мержу
|
||||
merged: Смержен
|
||||
closed: Закрыт
|
||||
|
||||
activity:
|
||||
show_outdated_diff: Отобразить устаревшие изменения
|
||||
pull_requests:
|
||||
tabs:
|
||||
discussion: Дискуссия
|
||||
|
|
Loading…
Reference in New Issue