diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-31 21:10:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-31 21:10:12 +0000 |
| commit | 8bb9ee876910bf5a14e116ace9ec95791486a78a (patch) | |
| tree | 7e2ad1f15f11dcbb5b45b2a581b7d720c272885d /app/views/doorkeeper | |
| parent | 04338021ada9669bcf8d6cf2d35b0debf50e8cc1 (diff) | |
| download | gitlab-ce-8bb9ee876910bf5a14e116ace9ec95791486a78a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/doorkeeper')
| -rw-r--r-- | app/views/doorkeeper/applications/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/doorkeeper/authorizations/new.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml index d74cba984e8..7fbaa35d1d5 100644 --- a/app/views/doorkeeper/applications/_form.html.haml +++ b/app/views/doorkeeper/applications/_form.html.haml @@ -13,7 +13,7 @@ = _('Use one line per URI') - if Doorkeeper.configuration.native_redirect_uri %span.form-text.text-muted - = _('Use <code>%{native_redirect_uri}</code> for local tests').html_safe % { native_redirect_uri: Doorkeeper.configuration.native_redirect_uri } + = html_escape(_('Use %{native_redirect_uri} for local tests')) % { native_redirect_uri: tag.code(Doorkeeper.configuration.native_redirect_uri) } .form-group.form-check = f.check_box :confidential, class: 'form-check-input' diff --git a/app/views/doorkeeper/authorizations/new.html.haml b/app/views/doorkeeper/authorizations/new.html.haml index 70abc1a267a..62e66486a3e 100644 --- a/app/views/doorkeeper/authorizations/new.html.haml +++ b/app/views/doorkeeper/authorizations/new.html.haml @@ -11,7 +11,7 @@ .text-warning %p = icon("exclamation-triangle fw") - = _('You are an admin, which means granting access to <strong>%{client_name}</strong> will allow them to interact with GitLab as an admin as well. Proceed with caution.').html_safe % { client_name: @pre_auth.client.name } + = html_escape(_('You are an admin, which means granting access to %{client_name} will allow them to interact with GitLab as an admin as well. Proceed with caution.')) % { client_name: tag.strong(@pre_auth.client.name) } %p - link_to_client = link_to(@pre_auth.client.name, @pre_auth.redirect_uri, target: '_blank', rel: 'noopener noreferrer') = _("An application called %{link_to_client} is requesting access to your GitLab account.").html_safe % { link_to_client: link_to_client } |