Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
2993e280
Commit
2993e280
authored
Mar 24, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'note-avatar-link' into 'master'
Link note avatar to user. See merge request !446
parents
69ab616b
1651c0bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/notes/_discussion.html.haml
app/views/projects/notes/_discussion.html.haml
+2
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+4
-2
No files found.
CHANGELOG
View file @
2993e280
...
...
@@ -35,6 +35,7 @@ v 7.10.0 (unreleased)
- Don't show commit comment button when user is not signed in.
- Don't include system notes in issue/MR comment count.
- Don't mark merge request as updated when merge status relative to target branch changes.
- Link note avatar to user.
v 7.9.0
- Send EmailsOnPush email when branch or tag is created or deleted.
...
...
app/views/projects/notes/_discussion.html.haml
View file @
2993e280
...
...
@@ -2,7 +2,8 @@
.timeline-entry
.timeline-entry-inner
.timeline-icon
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s40"
=
link_to
user_path
(
note
.
author
)
do
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s40"
.timeline-content
-
if
note
.
for_merge_request?
-
if
note
.
outdated?
...
...
app/views/projects/notes/_note.html.haml
View file @
2993e280
...
...
@@ -4,7 +4,8 @@
-
if
note
.
system
%span
.fa.fa-circle
-
else
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s40"
=
link_to
user_path
(
note
.
author
)
do
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s40"
.timeline-content
.note-header
.note-actions
...
...
@@ -21,7 +22,8 @@
%i
.fa.fa-trash-o.cred
Remove
-
if
note
.
system
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s16"
=
link_to
user_path
(
note
.
author
)
do
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
"avatar s16"
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
%span
.author-username
=
'@'
+
note
.
author
.
username
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment