Commit 19251a1f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents c2ee828c 434180c7
...@@ -61,6 +61,7 @@ v 7.11.0 (unreleased) ...@@ -61,6 +61,7 @@ v 7.11.0 (unreleased)
- Fix automatic blocking of auto-created users from Active Directory. - Fix automatic blocking of auto-created users from Active Directory.
- Call merge request web hook for each new commits (Arthur Gautier) - Call merge request web hook for each new commits (Arthur Gautier)
- Use SIGKILL by default in Sidekiq::MemoryKiller - Use SIGKILL by default in Sidekiq::MemoryKiller
- Fix mentioning of private groups.
v 7.10.2 v 7.10.2
- Fix CI links on MR page - Fix CI links on MR page
......
...@@ -33,7 +33,16 @@ ul.notes { ...@@ -33,7 +33,16 @@ ul.notes {
&:before { &:before {
content: "\00b7"; content: "\00b7";
} }
font-size: 13px; font-size: 13px;
a {
@extend .cgray;
&:hover {
text-decoration: underline;
}
}
} }
.author { .author {
color: #333; color: #333;
...@@ -47,7 +56,7 @@ ul.notes { ...@@ -47,7 +56,7 @@ ul.notes {
.note-role { .note-role {
float: right; float: right;
margin-top: 2px; margin-top: 1px;
border: 1px solid #bbb; border: 1px solid #bbb;
background-color: transparent; background-color: transparent;
color: #999; color: #999;
...@@ -142,31 +151,23 @@ ul.notes { ...@@ -142,31 +151,23 @@ ul.notes {
.discussion, .discussion,
.note { .note {
&.note:hover {
.note-actions { display: block; }
.note-actions + .note-role { display: none; }
}
.discussion-header:hover {
.discussion-actions { display: block; }
}
.discussion-actions, .discussion-actions,
.note-actions { .note-actions {
display: none;
float: right; float: right;
margin-left: 10px;
a {
margin-left: 5px;
color: #999;
i.fa { i.fa {
font-size: 16px; font-size: 16px;
line-height: 16px; line-height: 16px;
vertical-align: middle;
} }
a {
margin-left: 5px;
@extend .cgray;
&:hover { &:hover {
@extend .cgray;
&.danger { @extend .cred; } &.danger { @extend .cred; }
} }
} }
......
...@@ -42,10 +42,10 @@ module Mentionable ...@@ -42,10 +42,10 @@ module Mentionable
SystemNoteService.cross_reference_exists?(target, local_reference) SystemNoteService.cross_reference_exists?(target, local_reference)
end end
def mentioned_users(current_user = nil, p = project) def mentioned_users(current_user = nil)
return [] if mentionable_text.blank? return [] if mentionable_text.blank?
ext = Gitlab::ReferenceExtractor.new(p, current_user) ext = Gitlab::ReferenceExtractor.new(self.project, current_user)
ext.analyze(mentionable_text) ext.analyze(mentionable_text)
ext.users.uniq ext.users.uniq
end end
......
...@@ -40,7 +40,7 @@ module Participable ...@@ -40,7 +40,7 @@ module Participable
meth = method(attr) meth = method(attr)
value = value =
if meth.arity == 1 if meth.arity == 1 || meth.arity == -1
meth.call(current_user) meth.call(current_user)
else else
meth.call meth.call
......
...@@ -8,19 +8,13 @@ ...@@ -8,19 +8,13 @@
= image_tag avatar_icon(note.author_email), class: 'avatar s40', alt: '' = image_tag avatar_icon(note.author_email), class: 'avatar s40', alt: ''
.timeline-content .timeline-content
.note-header .note-header
.note-actions
= link_to "##{dom_id(note)}", name: dom_id(note), title: "Link here" do
= icon('link fw')
Link here
- if note_editable?(note) - if note_editable?(note)
.note-actions
= link_to '#', title: 'Edit comment', class: 'js-note-edit' do = link_to '#', title: 'Edit comment', class: 'js-note-edit' do
= icon('pencil-square-o fw') = icon('pencil-square-o')
Edit
= link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'danger js-note-delete' do = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'js-note-delete danger' do
= icon('trash-o fw', class: 'cred') = icon('trash-o')
Remove
- unless note.system - unless note.system
- member = note.project.team.find_member(note.author.id) - member = note.project.team.find_member(note.author.id)
...@@ -33,9 +27,12 @@ ...@@ -33,9 +27,12 @@
= image_tag avatar_icon(note.author_email), class: 'avatar s16', alt: '' = image_tag avatar_icon(note.author_email), class: 'avatar s16', alt: ''
= link_to_member(note.project, note.author, avatar: false) = link_to_member(note.project, note.author, avatar: false)
%span.author-username %span.author-username
= '@' + note.author.username = '@' + note.author.username
%span.note-last-update %span.note-last-update
= link_to "##{dom_id(note)}", name: dom_id(note), title: "Link here" do
= note_timestamp(note) = note_timestamp(note)
- if note.superceded?(@notes) - if note.superceded?(@notes)
......
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
- last_note = discussion_notes.last - last_note = discussion_notes.last
last updated by last updated by
= link_to_member(@project, last_note.author, avatar: false) = link_to_member(@project, last_note.author, avatar: false)
%span.discussion-last-update %span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')} #{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
.discussion-body.js-toggle-content .discussion-body.js-toggle-content
= render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note = render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment