diff options
author | Michael Kozono <mkozono@gmail.com> | 2019-08-01 20:44:38 +0000 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2019-08-01 20:44:38 +0000 |
commit | 52b857f119debb5a03c216c4199eb21a49d815b6 (patch) | |
tree | e024d7638e8683c1902bf4b220d44fcdd57fe807 /app/views/shared/notes/_hints.html.haml | |
parent | b2dd581be375e4f21af9d2c487528ffd06508618 (diff) | |
parent | 84b6c7a5f3bf3d6f96331d73225903d3fd92b4e2 (diff) | |
download | gitlab-ce-52b857f119debb5a03c216c4199eb21a49d815b6.tar.gz |
Merge branch 'revert-editor-indents' into 'master'
Revert "Merge branch 'mh/editor-indents' into 'master'"
See merge request gitlab-org/gitlab-ce!31391
Diffstat (limited to 'app/views/shared/notes/_hints.html.haml')
-rw-r--r-- | app/views/shared/notes/_hints.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/shared/notes/_hints.html.haml b/app/views/shared/notes/_hints.html.haml index 72ede50dd8c..fae7d6526e8 100644 --- a/app/views/shared/notes/_hints.html.haml +++ b/app/views/shared/notes/_hints.html.haml @@ -1,13 +1,14 @@ - supports_quick_actions = local_assigns.fetch(:supports_quick_actions, false) .comment-toolbar.clearfix .toolbar-text - - md_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" tabindex="-1">'.html_safe % { url: help_page_path('user/markdown') } - - actions_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" tabindex="-1">'.html_safe % { url: help_page_path('user/project/quick_actions') } - - link_end = '</a>'.html_safe + = link_to _('Markdown'), help_page_path('user/markdown'), target: '_blank', tabindex: -1 - if supports_quick_actions - = s_('Editor|%{mdLinkStart}Markdown%{mdLinkEnd} and %{actionsLinkStart}quick actions%{actionsLinkEnd} are supported').html_safe % { mdLinkStart: md_link_start, mdLinkEnd: link_end, actionsLinkStart: actions_link_start, actionsLinkEnd: link_end } + and + = link_to _('quick actions'), help_page_path('user/project/quick_actions'), target: '_blank', tabindex: -1 + are - else - = s_('Editor|%{mdLinkStart}Markdown is supported%{mdLinkEnd}').html_safe % { mdLinkStart: md_link_start, mdLinkEnd: link_end } + is + supported %span.uploading-container %span.uploading-progress-container.hide |