Commit 12bcf246 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'sh-aws-text-drop-double-space' into 'master'

Drop double space in AWS help text

See merge request gitlab-org/gitlab!49633
parents 40a8cdb0 3ceea9de
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
= f.label :eks_access_key_id, 'Access key ID', class: 'label-bold' = f.label :eks_access_key_id, 'Access key ID', class: 'label-bold'
= f.text_field :eks_access_key_id, class: 'form-control' = f.text_field :eks_access_key_id, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= _('AWS Access Key. Only required if not using role instance credentials') = _('AWS Access Key. Only required if not using role instance credentials')
.form-group .form-group
= f.label :eks_secret_access_key, 'Secret access key', class: 'label-bold' = f.label :eks_secret_access_key, 'Secret access key', class: 'label-bold'
= f.password_field :eks_secret_access_key, autocomplete: 'off', class: 'form-control' = f.password_field :eks_secret_access_key, autocomplete: 'off', class: 'form-control'
.form-text.text-muted .form-text.text-muted
= _('AWS Secret Access Key. Only required if not using role instance credentials') = _('AWS Secret Access Key. Only required if not using role instance credentials')
= f.submit 'Save changes', class: "gl-button btn btn-success" = f.submit 'Save changes', class: "gl-button btn btn-success"
...@@ -200,13 +200,13 @@ ...@@ -200,13 +200,13 @@
= f.label :elasticsearch_aws_access_key, _('AWS Access Key'), class: 'label-bold' = f.label :elasticsearch_aws_access_key, _('AWS Access Key'), class: 'label-bold'
= f.text_field :elasticsearch_aws_access_key, value: @application_setting.elasticsearch_aws_access_key, class: 'form-control' = f.text_field :elasticsearch_aws_access_key, value: @application_setting.elasticsearch_aws_access_key, class: 'form-control'
.form-text.text-muted .form-text.text-muted
= _('AWS Access Key. Only required if not using role instance credentials') = _('AWS Access Key. Only required if not using role instance credentials')
- secret_access_key_label = @application_setting.elasticsearch_aws_secret_access_key.present? ? _('Enter new AWS Secret Access Key') : _('AWS Secret Access Key') - secret_access_key_label = @application_setting.elasticsearch_aws_secret_access_key.present? ? _('Enter new AWS Secret Access Key') : _('AWS Secret Access Key')
.form-group .form-group
= f.label :elasticsearch_aws_secret_access_key, secret_access_key_label, class: 'label-bold' = f.label :elasticsearch_aws_secret_access_key, secret_access_key_label, class: 'label-bold'
= f.password_field :elasticsearch_aws_secret_access_key, autocomplete: 'new-password', class: 'form-control' = f.password_field :elasticsearch_aws_secret_access_key, autocomplete: 'new-password', class: 'form-control'
.form-text.text-muted .form-text.text-muted
= _('AWS Secret Access Key. Only required if not using role instance credentials') = _('AWS Secret Access Key. Only required if not using role instance credentials')
= f.submit _('Save changes'), class: "gl-button btn btn-success", data: { qa_selector: 'submit_button' } = f.submit _('Save changes'), class: "gl-button btn btn-success", data: { qa_selector: 'submit_button' }
...@@ -1328,13 +1328,13 @@ msgstr "" ...@@ -1328,13 +1328,13 @@ msgstr ""
msgid "AWS Access Key" msgid "AWS Access Key"
msgstr "" msgstr ""
msgid "AWS Access Key. Only required if not using role instance credentials" msgid "AWS Access Key. Only required if not using role instance credentials"
msgstr "" msgstr ""
msgid "AWS Secret Access Key" msgid "AWS Secret Access Key"
msgstr "" msgstr ""
msgid "AWS Secret Access Key. Only required if not using role instance credentials" msgid "AWS Secret Access Key. Only required if not using role instance credentials"
msgstr "" msgstr ""
msgid "AWS service error: %{error}" msgid "AWS service error: %{error}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment