diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-27 15:09:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-27 15:09:50 +0300 |
| commit | 8827c1d18473a3d84db181c89212975418a25e37 (patch) | |
| tree | 3f16c4b02b0b46fb2f501a6d5e9fc0f93f1a406f /app/helpers/import_helper.rb | |
| parent | 43b35a88ca54379d8df4dad84b5a84f9eecae3f2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/import_helper.rb')
| -rw-r--r-- | app/helpers/import_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/import_helper.rb b/app/helpers/import_helper.rb index 1ee67211ab0..329bbb5ad82 100644 --- a/app/helpers/import_helper.rb +++ b/app/helpers/import_helper.rb @@ -56,7 +56,7 @@ module ImportHelper link_url = 'https://github.com/settings/tokens' link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: link_url } - _('Create and provide your GitHub %{link_start}Personal Access Token%{link_end}. You will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } + html_escape(_('Create and provide your GitHub %{link_start}Personal Access Token%{link_end}. You will need to select the %{code_open}repo%{code_close} scope, so we can display a list of your public and private repositories which are available to import.')) % { link_start: link_start, link_end: '</a>'.html_safe, code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } end def import_configure_github_admin_message |