summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/notes.scss35
-rw-r--r--app/models/concerns/mentionable.rb4
-rw-r--r--app/models/concerns/participable.rb2
-rw-r--r--app/views/projects/notes/_note.html.haml21
-rw-r--r--app/views/projects/notes/discussions/_active.html.haml2
6 files changed, 33 insertions, 32 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b9811039736..dd69d73d86f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@ v 7.11.0 (unreleased)
- Fix automatic blocking of auto-created users from Active Directory.
- Call merge request web hook for each new commits (Arthur Gautier)
- Use SIGKILL by default in Sidekiq::MemoryKiller
+ - Fix mentioning of private groups.
v 7.10.2
- Fix CI links on MR page
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 61b907e39be..e943be67dbf 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -33,7 +33,16 @@ ul.notes {
&:before {
content: "\00b7";
}
+
font-size: 13px;
+
+ a {
+ @extend .cgray;
+
+ &:hover {
+ text-decoration: underline;
+ }
+ }
}
.author {
color: #333;
@@ -47,7 +56,7 @@ ul.notes {
.note-role {
float: right;
- margin-top: 2px;
+ margin-top: 1px;
border: 1px solid #bbb;
background-color: transparent;
color: #999;
@@ -142,31 +151,23 @@ ul.notes {
.discussion,
.note {
- &.note:hover {
- .note-actions { display: block; }
- .note-actions + .note-role { display: none; }
- }
- .discussion-header:hover {
- .discussion-actions { display: block; }
- }
-
.discussion-actions,
.note-actions {
- display: none;
float: right;
-
- i.fa {
- font-size: 16px;
- line-height: 16px;
- vertical-align: middle;
- }
+ margin-left: 10px;
a {
margin-left: 5px;
- @extend .cgray;
+ color: #999;
+
+ i.fa {
+ font-size: 16px;
+ line-height: 16px;
+ }
&:hover {
+ @extend .cgray;
&.danger { @extend .cred; }
}
}
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index a5957391bb7..b7c39df885d 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -42,10 +42,10 @@ module Mentionable
SystemNoteService.cross_reference_exists?(target, local_reference)
end
- def mentioned_users(current_user = nil, p = project)
+ def mentioned_users(current_user = nil)
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.users.uniq
end
diff --git a/app/models/concerns/participable.rb b/app/models/concerns/participable.rb
index 7a5e4876ff2..a4832204f7b 100644
--- a/app/models/concerns/participable.rb
+++ b/app/models/concerns/participable.rb
@@ -40,7 +40,7 @@ module Participable
meth = method(attr)
value =
- if meth.arity == 1
+ if meth.arity == 1 || meth.arity == -1
meth.call(current_user)
else
meth.call
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index 2f3c407d6e9..0a77f200f56 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -8,19 +8,13 @@
= image_tag avatar_icon(note.author_email), class: 'avatar s40', alt: ''
.timeline-content
.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
- = icon('pencil-square-o fw')
- Edit
+ = icon('pencil-square-o')
- = 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
- = icon('trash-o fw', class: 'cred')
- Remove
+ = 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')
- unless note.system
- member = note.project.team.find_member(note.author.id)
@@ -33,10 +27,13 @@
= image_tag avatar_icon(note.author_email), class: 'avatar s16', alt: ''
= link_to_member(note.project, note.author, avatar: false)
+
%span.author-username
= '@' + note.author.username
+
%span.note-last-update
- = note_timestamp(note)
+ = link_to "##{dom_id(note)}", name: dom_id(note), title: "Link here" do
+ = note_timestamp(note)
- if note.superceded?(@notes)
- if note.upvote?
diff --git a/app/views/projects/notes/discussions/_active.html.haml b/app/views/projects/notes/discussions/_active.html.haml
index 7c6f7243173..e7a3854701c 100644
--- a/app/views/projects/notes/discussions/_active.html.haml
+++ b/app/views/projects/notes/discussions/_active.html.haml
@@ -14,7 +14,9 @@
- last_note = discussion_notes.last
last updated by
= link_to_member(@project, last_note.author, avatar: false)
+
%span.discussion-last-update
#{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
+
.discussion-body.js-toggle-content
= render "projects/notes/discussions/diff", discussion_notes: discussion_notes, note: note