Commit c8bd099c authored by Sean McGivern's avatar Sean McGivern

Merge branch 'user-friendly-instance-configuration' into 'master'

Show description when SSH public key is not available on a GitLab instance

See merge request gitlab-org/gitlab!18363
parents d75ff510 c9596d7d
- ssh_info = @instance_configuration.settings[:ssh_algorithms_hashes] - ssh_info = @instance_configuration.settings[:ssh_algorithms_hashes]
- if ssh_info.any? - content_for :table_content do
- content_for :table_content do %li
%li= link_to 'SSH host keys fingerprints', '#ssh-host-keys-fingerprints' = link_to _('SSH host key fingerprints'), '#ssh-host-keys-fingerprints'
- content_for :settings_content do - content_for :settings_content do
%h2#ssh-host-keys-fingerprints %h2#ssh-host-keys-fingerprints
SSH host keys fingerprints = _('SSH host key fingerprints')
- if ssh_info.blank?
%p %p
Below are the fingerprints for the current instance SSH host keys. = _('SSH host keys are not available on this system. Please use <code>ssh-keyscan</code> command or contact your GitLab administrator for more information.').html_safe
- else
%p
= _('Below are the fingerprints for the current instance SSH host keys.')
.table-responsive .table-responsive
%table %table
%thead %thead
%tr %tr
%th Algorithm %th
%th MD5 = _('Algorithm')
%th SHA256 %th
= _('MD5')
%th
= _('SHA256')
%tbody %tbody
- ssh_info.each do |algorithm| - ssh_info.each do |algorithm|
%tr %tr
......
---
title: Make instance configuration user friendly
merge_request: 18363
author: Takuya Noguchi
type: other
...@@ -1323,6 +1323,9 @@ msgstr "" ...@@ -1323,6 +1323,9 @@ msgstr ""
msgid "Alerts endpoint" msgid "Alerts endpoint"
msgstr "" msgstr ""
msgid "Algorithm"
msgstr ""
msgid "All" msgid "All"
msgstr "" msgstr ""
...@@ -2358,6 +2361,9 @@ msgstr "" ...@@ -2358,6 +2361,9 @@ msgstr ""
msgid "Below are examples of regex for existing tools:" msgid "Below are examples of regex for existing tools:"
msgstr "" msgstr ""
msgid "Below are the fingerprints for the current instance SSH host keys."
msgstr ""
msgid "Below you will find all the groups that are public." msgid "Below you will find all the groups that are public."
msgstr "" msgstr ""
...@@ -9707,6 +9713,9 @@ msgstr "" ...@@ -9707,6 +9713,9 @@ msgstr ""
msgid "Logs" msgid "Logs"
msgstr "" msgstr ""
msgid "MD5"
msgstr ""
msgid "MERGED" msgid "MERGED"
msgstr "" msgstr ""
...@@ -13912,6 +13921,9 @@ msgstr "" ...@@ -13912,6 +13921,9 @@ msgstr ""
msgid "SAML for %{group_name}" msgid "SAML for %{group_name}"
msgstr "" msgstr ""
msgid "SHA256"
msgstr ""
msgid "SSH Key" msgid "SSH Key"
msgstr "" msgstr ""
...@@ -13921,9 +13933,15 @@ msgstr "" ...@@ -13921,9 +13933,15 @@ msgstr ""
msgid "SSH Keys Help" msgid "SSH Keys Help"
msgstr "" msgstr ""
msgid "SSH host key fingerprints"
msgstr ""
msgid "SSH host keys" msgid "SSH host keys"
msgstr "" msgstr ""
msgid "SSH host keys are not available on this system. Please use <code>ssh-keyscan</code> command or contact your GitLab administrator for more information."
msgstr ""
msgid "SSH keys allow you to establish a secure connection between your computer and GitLab." msgid "SSH keys allow you to establish a secure connection between your computer and GitLab."
msgstr "" msgstr ""
......
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