diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-05 21:09:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-05 21:09:12 +0000 |
| commit | 055dceef99269657e39c5264a8464b078e37e069 (patch) | |
| tree | 998411da93402a473838f033bd01d56554f4cd2e /app/views/projects/commits | |
| parent | bc4cd6ffb93ae695f20ea54f4e4803d50c78a69e (diff) | |
| download | gitlab-ce-055dceef99269657e39c5264a8464b078e37e069.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/commits')
| -rw-r--r-- | app/views/projects/commits/_commits.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/commits/show.html.haml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml index b79f17ae7b3..a877af20426 100644 --- a/app/views/projects/commits/_commits.html.haml +++ b/app/views/projects/commits/_commits.html.haml @@ -8,8 +8,9 @@ - hidden = @hidden_commit_count - commits.chunk { |c| c.committed_date.in_time_zone.to_date }.each do |day, daily_commits| - %li.commit-header.js-commit-header{ data: { day: day } } - %span.day= l(day, format: '%d %b, %Y') + %li.js-commit-header.gl-mt-7.gl-pb-2.gl-border-b{ data: { day: day } } + %span.day.font-weight-bold= l(day, format: '%d %b, %Y') + %span - %span.commits-count= n_("%d commit", "%d commits", daily_commits.size) % daily_commits.size %li.commits-row{ data: { day: day } } @@ -20,7 +21,7 @@ = render partial: 'projects/commits/commit', collection: daily_commits, locals: { project: project, ref: ref, merge_request: merge_request } - if context_commits.present? - %li.commit-header.js-commit-header + %li.js-commit-header.gl-mt-7.gl-pb-2.gl-border-b %span.font-weight-bold= n_("%d previously merged commit", "%d previously merged commits", context_commits.count) % context_commits.count - if can_update_merge_request = render Pajamas::ButtonComponent.new(button_options: { class: 'gl-ml-3 add-review-item-modal-trigger', data: { context_commits_empty: 'false' } }) do diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml index 689862eae8a..4c5a9acdf83 100644 --- a/app/views/projects/commits/show.html.haml +++ b/app/views/projects/commits/show.html.haml @@ -6,7 +6,7 @@ = auto_discovery_link_tag(:atom, project_commits_path(@project, @ref, rss_url_options), title: "#{@project.name}:#{@ref} commits") .js-project-commits-show{ 'data-commits-limit' => @limit } - .tree-holder + .tree-holder.gl-mt-5 .nav-block .tree-ref-container .tree-ref-holder.gl-max-w-26 |