diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-29 08:50:30 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-29 08:50:30 +0000 |
| commit | 8a7ca539653cc19db242123328bff2b6dd8fcf82 (patch) | |
| tree | 70cc1d580f041ab6d3ce279167ad757f9511ae26 | |
| parent | 2c2cb12bf1ab48c30aae59006b34bdb67cfeff0d (diff) | |
| parent | 4683034b4ffead30485ac1b1b8c4a626c03cf1ce (diff) | |
| download | gitlab-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
| -rw-r--r-- | app/views/projects/notes/_actions.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 2 |
2 files changed, 2 insertions, 2 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) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 600432be3bf..ff6c8fa07a7 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1382,7 +1382,7 @@ msgstr "" msgid "There are problems accessing Git storage: " msgstr "" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is the author's first Merge Request to this project." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." |