Commit f375642b authored by Robert Speicher's avatar Robert Speicher

Merge branch 'tc-wording-geo-admin-ssh-key' into 'master'

Change wording about the ssh key of Geo nodes admin page

Closes #3290

See merge request !2794
parents 0f1edc5c 71d7dac4
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
= fg.text_area :key, class: 'form-control thin_area', rows: 5, disabled: disable_key_edit = fg.text_area :key, class: 'form-control thin_area', rows: 5, disabled: disable_key_edit
- unless disable_key_edit - unless disable_key_edit
%p.help-block %p.help-block
Paste a machine public key here for the GitLab user this node runs on. Read more about how to generate it Paste the ssh public key used by the node you are adding. Read more about it
= link_to 'here', help_page_path('ssh/README') = link_to 'here', help_page_path('gitlab-geo/configuration.html', anchor: 'step-5-enabling-the-secondary-gitlab-node')
.form-group.js-namespaces{ class: ('hidden' unless geo_node.new_record? || geo_node.secondary?) } .form-group.js-namespaces{ class: ('hidden' unless geo_node.new_record? || geo_node.secondary?) }
= form.label :namespace_ids, 'Namespaces to replicate', class: 'control-label' = form.label :namespace_ids, 'Namespaces to replicate', class: 'control-label'
......
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