summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-09-29 08:50:30 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-09-29 08:50:30 +0000
commit8a7ca539653cc19db242123328bff2b6dd8fcf82 (patch)
tree70cc1d580f041ab6d3ce279167ad757f9511ae26 /app/views
parent2c2cb12bf1ab48c30aae59006b34bdb67cfeff0d (diff)
parent4683034b4ffead30485ac1b1b8c4a626c03cf1ce (diff)
downloadgitlab-ce-8a7ca539653cc19db242123328bff2b6dd8fcf82.tar.gz
Merge branch 'first-time-contributor-tooltip-text' into 'master'
Tweaked the first time contributor tooltip text See merge request gitlab-org/gitlab-ce!14565
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/notes/_actions.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_actions.html.haml b/app/views/projects/notes/_actions.html.haml
index ab87b5e0005..4961835f12a 100644
--- a/app/views/projects/notes/_actions.html.haml
+++ b/app/views/projects/notes/_actions.html.haml
@@ -1,6 +1,6 @@
- access = note_max_access_for_user(note)
- 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.") }
= issuable_first_contribution_icon
- if access.nonzero?
%span.note-role.note-role-access= Gitlab::Access.human_access(access)