Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
111b8f2c
Commit
111b8f2c
authored
Feb 21, 2022
by
Russell Dickenson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve Amazon EKS settings text
Changelog: changed
parent
70f434db
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
15 deletions
+12
-15
app/views/admin/application_settings/_eks.html.haml
app/views/admin/application_settings/_eks.html.haml
+4
-4
locale/gitlab.pot
locale/gitlab.pot
+6
-9
spec/views/admin/application_settings/_eks.html.haml_spec.rb
spec/views/admin/application_settings/_eks.html.haml_spec.rb
+2
-2
No files found.
app/views/admin/application_settings/_eks.html.haml
View file @
111b8f2c
...
@@ -22,15 +22,15 @@
...
@@ -22,15 +22,15 @@
=
f
.
label
:eks_account_id
,
_
(
'Account ID'
),
class:
'label-bold'
=
f
.
label
:eks_account_id
,
_
(
'Account ID'
),
class:
'label-bold'
=
f
.
text_field
:eks_account_id
,
class:
'form-control gl-form-input'
=
f
.
text_field
:eks_account_id
,
class:
'form-control gl-form-input'
.form-group
.form-group
=
f
.
label
:eks_access_key_id
,
_
(
'A
ccess key ID
'
),
class:
'label-bold'
=
f
.
label
:eks_access_key_id
,
_
(
'A
WS access key ID (Optional)
'
),
class:
'label-bold'
=
f
.
text_field
:eks_access_key_id
,
class:
'form-control gl-form-input'
=
f
.
text_field
:eks_access_key_id
,
class:
'form-control gl-form-input'
.form-text.text-muted
.form-text.text-muted
=
_
(
'
AWS Access Key. Only required if not using role instance credentials
'
)
=
_
(
'
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
,
_
(
'
AWS secret access key (Optional)
'
),
class:
'label-bold'
=
f
.
password_field
:eks_secret_access_key
,
autocomplete:
'off'
,
class:
'form-control gl-form-input'
=
f
.
password_field
:eks_secret_access_key
,
autocomplete:
'off'
,
class:
'form-control gl-form-input'
.form-text.text-muted
.form-text.text-muted
=
_
(
'
AWS Secret Access Key. Only required if not using role instance credentials
'
)
=
_
(
'
Only required if not using role instance credentials.
'
)
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-confirm"
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-confirm"
locale/gitlab.pot
View file @
111b8f2c
...
@@ -1773,13 +1773,13 @@ msgstr ""
...
@@ -1773,13 +1773,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
Secret Access Key
"
msgstr ""
msgstr ""
msgid "AWS
Secret Access Key
"
msgid "AWS
access key ID (Optional)
"
msgstr ""
msgstr ""
msgid "AWS
Secret Access Key. Only required if not using role instance credentials
"
msgid "AWS
secret access key (Optional)
"
msgstr ""
msgstr ""
msgid "AWS service error: %{error}"
msgid "AWS service error: %{error}"
...
@@ -1839,9 +1839,6 @@ msgstr ""
...
@@ -1839,9 +1839,6 @@ msgstr ""
msgid "Access granted"
msgid "Access granted"
msgstr ""
msgstr ""
msgid "Access key ID"
msgstr ""
msgid "Access requests"
msgid "Access requests"
msgstr ""
msgstr ""
...
@@ -25574,6 +25571,9 @@ msgstr ""
...
@@ -25574,6 +25571,9 @@ msgstr ""
msgid "Only reCAPTCHA v2 is supported:"
msgid "Only reCAPTCHA v2 is supported:"
msgstr ""
msgstr ""
msgid "Only required if not using role instance credentials."
msgstr ""
msgid "Only use lowercase letters, numbers, and underscores."
msgid "Only use lowercase letters, numbers, and underscores."
msgstr ""
msgstr ""
...
@@ -32214,9 +32214,6 @@ msgstr ""
...
@@ -32214,9 +32214,6 @@ msgstr ""
msgid "Secret Detection"
msgid "Secret Detection"
msgstr ""
msgstr ""
msgid "Secret access key"
msgstr ""
msgid "Secret token"
msgid "Secret token"
msgstr ""
msgstr ""
...
...
spec/views/admin/application_settings/_eks.html.haml_spec.rb
View file @
111b8f2c
...
@@ -16,8 +16,8 @@ RSpec.describe 'admin/application_settings/_eks' do
...
@@ -16,8 +16,8 @@ RSpec.describe 'admin/application_settings/_eks' do
shared_examples
'EKS secret access key input'
do
shared_examples
'EKS secret access key input'
do
it
'renders an empty password field'
do
it
'renders an empty password field'
do
render
render
expect
(
rendered
).
to
have_field
(
'
Secret access key
'
,
type:
'password'
)
expect
(
rendered
).
to
have_field
(
'
AWS secret access key (Optional)
'
,
type:
'password'
)
expect
(
page
.
find_field
(
'
Secret access key
'
).
value
).
to
be_blank
expect
(
page
.
find_field
(
'
AWS secret access key (Optional)
'
).
value
).
to
be_blank
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment