b4aaced71a
This changes the style of push events that remove tags or branches so
they don't display the commit details. This prevents displaying commit
details such as:
000000 . --broken encoding
Instead we now simply display the header such as:
Administrator deleted branch example-branch
This is displayed in the same style as events for newly created
branches/tags.
This commit also ensures that if no commit message is present we simply
don't display anything, instead of "--broken encoding".
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
43 lines
1.5 KiB
Text
43 lines
1.5 KiB
Text
- project = event.project
|
|
|
|
= icon_for_profile_event(event)
|
|
|
|
.event-title
|
|
%span.author_name= link_to_author event
|
|
%span.pushed #{event.action_name} #{event.ref_type}
|
|
%strong
|
|
- commits_link = project_commits_path(project, event.ref_name)
|
|
= link_to_if project.repository.branch_exists?(event.ref_name), event.ref_name, commits_link, class: 'ref-name'
|
|
|
|
= render "events/event_scope", event: event
|
|
|
|
- if event.push_with_commits?
|
|
.event-body
|
|
%ul.well-list.event_commits
|
|
= render "events/commit", project: project, event: event
|
|
|
|
- create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project) && event.authored_by?(current_user)
|
|
- if event.commits_count > 1
|
|
%li.commits-stat
|
|
- if event.commits_count > 2
|
|
%span ... and #{event.commits_count - 2} more commits.
|
|
|
|
- if event.md_ref?
|
|
- from = event.commit_from
|
|
- from_label = truncate_sha(from)
|
|
- else
|
|
- from = project.default_branch
|
|
- from_label = from
|
|
|
|
= link_to project_compare_path(project, from: from, to: event.commit_to) do
|
|
Compare #{from_label}...#{truncate_sha(event.commit_to)}
|
|
|
|
- if create_mr
|
|
%span
|
|
or
|
|
= link_to create_mr_path(project.default_branch, event.ref_name, project) do
|
|
create a merge request
|
|
- elsif create_mr
|
|
%li.commits-stat
|
|
= link_to create_mr_path(project.default_branch, event.ref_name, project) do
|
|
Create Merge Request
|