Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/events')
-rw-r--r--app/views/events/event/_note.html.haml2
-rw-r--r--app/views/events/event/_push.html.haml4
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