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
Boxiang Sun
gitlab-ce
Commits
6e65c755
Commit
6e65c755
authored
Sep 25, 2017
by
Micael Bergeron
Committed by
Rémy Coutable
Sep 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a dash being rendered in the note's access role
parent
a4ffde6e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
app/views/projects/notes/_actions.html.haml
app/views/projects/notes/_actions.html.haml
+2
-1
changelogs/unreleased/37912-fix-dash-in-note-access-role.yml
changelogs/unreleased/37912-fix-dash-in-note-access-role.yml
+5
-0
No files found.
app/views/projects/notes/_actions.html.haml
View file @
6e65c755
-
access
=
note_max_access_for_user
(
note
)
-
if
note
.
has_special_role?
(
Note
::
SpecialRole
::
FIRST_TIME_CONTRIBUTOR
)
-
if
note
.
has_special_role?
(
Note
::
SpecialRole
::
FIRST_TIME_CONTRIBUTOR
)
%span
.note-role.note-role-special.has-tooltip
{
title:
_
(
"This is the author's first Merge Request to this project. Handle with care."
)
}
%span
.note-role.note-role-special.has-tooltip
{
title:
_
(
"This is the author's first Merge Request to this project. Handle with care."
)
}
=
issuable_first_contribution_icon
=
issuable_first_contribution_icon
-
if
access
=
note_max_access_for_user
(
note
)
-
if
access
.
nonzero?
%span
.note-role.note-role-access
=
Gitlab
::
Access
.
human_access
(
access
)
%span
.note-role.note-role-access
=
Gitlab
::
Access
.
human_access
(
access
)
-
if
note
.
resolvable?
-
if
note
.
resolvable?
...
...
changelogs/unreleased/37912-fix-dash-in-note-access-role.yml
0 → 100644
View file @
6e65c755
---
title
:
Notes will not show an empty bubble when the author isn't a member.
merge_request
:
14450
author
:
type
:
fixed
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