2018-03-17 18:26:18 +05:30
- merge_request = local_assigns.fetch(:merge_request, nil)
- project = local_assigns.fetch(:project) { merge_request&.project }
- ref = local_assigns.fetch(:ref) { merge_request&.source_branch }
2020-10-24 23:57:45 +05:30
- can_update_merge_request = can?(current_user, :update_merge_request, @merge_request)
2018-03-17 18:26:18 +05:30
2018-11-20 20:47:30 +05:30
- commits = @commits
2020-10-24 23:57:45 +05:30
- context_commits = @context_commits
2018-11-20 20:47:30 +05:30
- hidden = @hidden_commit_count
2016-06-02 11:05:42 +05:30
2020-05-05 14:28:15 +05:30
- commits.chunk { |c| c.committed_date.in_time_zone.to_date }.each do |day, daily_commits|
2017-09-10 17:25:29 +05:30
%li.commit-header.js-commit-header{ data: { day: day } }
%span.day= l(day, format: '%d %b, %Y')
2020-05-05 14:28:15 +05:30
%span.commits-count= n_("%d commit", "%d commits", daily_commits.size) % daily_commits.size
2017-09-10 17:25:29 +05:30
%li.commits-row{ data: { day: day } }
%ul.content-list.commit-list.flex-list
2020-05-05 14:28:15 +05:30
= render partial: 'projects/commits/commit', collection: daily_commits, locals: { project: project, ref: ref, merge_request: merge_request }
2016-06-02 11:05:42 +05:30
2020-10-24 23:57:45 +05:30
- if context_commits.present?
%li.commit-header.js-commit-header
%span.font-weight-bold= n_("%d previously merged commit", "%d previously merged commits", context_commits.count) % context_commits.count
- if project.context_commits_enabled? && can_update_merge_request
%button.btn.btn-default.ml-3.add-review-item-modal-trigger{ type: "button", data: { context_commits_empty: 'false' } }
= _('Add/remove')
%li.commits-row
%ul.content-list.commit-list.flex-list
= render partial: 'projects/commits/commit', collection: context_commits, locals: { project: project, ref: ref, merge_request: merge_request }
2016-06-02 11:05:42 +05:30
- if hidden > 0
2021-01-03 14:25:43 +05:30
%li.gl-alert.gl-alert-warning
= sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
2017-09-10 17:25:29 +05:30
= n_('%s additional commit has been omitted to prevent performance issues.', '%s additional commits have been omitted to prevent performance issues.', hidden) % number_with_delimiter(hidden)
2020-04-22 19:07:51 +05:30
2020-10-24 23:57:45 +05:30
- if project.context_commits_enabled? && can_update_merge_request && context_commits&.empty?
%button.btn.btn-default.mt-3.add-review-item-modal-trigger{ type: "button", data: { context_commits_empty: 'true' } }
= _('Add previously merged commits')
- if commits.size == 0 && context_commits.nil?
2020-04-22 19:07:51 +05:30
.mt-4.text-center
.bold
= _('Your search didn\'t match any commits.')
= _('Try changing or removing filters.')
