diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 17:36:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 17:36:54 +0300 |
| commit | f61bb2a16a514b71bf33aabbbb999d6732016a24 (patch) | |
| tree | 9548caa89e60b4f40b99bbd1dac030420b812aa8 /app/views/events | |
| parent | 35fc54e5d261f8898e390aea7c2f5ec5fdf0539d (diff) | |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42
Diffstat (limited to 'app/views/events')
| -rw-r--r-- | app/views/events/event/_note.html.haml | 2 | ||||
| -rw-r--r-- | app/views/events/event/_push.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 2fa595503e5..d08c3d5ba41 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -22,7 +22,7 @@ - if note.attachment.url - if note.attachment.image? = link_to note.attachment.url, target: '_blank' do - = image_tag note.attachment.url, class: 'note-image-attach' + = image_tag note.attachment.url, class: 'note-image-attach col-lg-4' - else = link_to note.attachment.url, target: '_blank', class: 'note-file-attach' do = sprite_icon("paperclip") diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 97dd606855b..62d6ab36578 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -18,7 +18,7 @@ - if event.push_with_commits? .event-body - %ul.content-list.event_commits + %ul.content-list.event-commits = render "events/commit", project: project, event: event - create_mr = event.new_ref? && create_mr_button?(from: project.default_branch, to: event.ref_name, source_project: project, target_project: project) && event.authored_by?(current_user) @@ -46,4 +46,4 @@ - elsif create_mr %li.commits-stat = link_to create_mr_path do - Create Merge Request + Create merge request |