From 90de5f9281a13028ecc0402c9bedbdadaf23e08f Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Thu, 24 Nov 2016 13:59:16 +0100 Subject: [PATCH] =?UTF-8?q?=E2=80=9CRemove=20user=20ID=20from=20Gitolite?= =?UTF-8?q?=20identifier=E2=80=9D=20requires=20a=20restart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a note to the admin. --- .../redmine_git_hosting/_gitolite_config_file.html.haml | 5 ++++- config/locales/settings/en.yml | 1 + config/locales/settings/fr.yml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/settings/redmine_git_hosting/_gitolite_config_file.html.haml b/app/views/settings/redmine_git_hosting/_gitolite_config_file.html.haml index b5a216c3c..7762a5270 100644 --- a/app/views/settings/redmine_git_hosting/_gitolite_config_file.html.haml +++ b/app/views/settings/redmine_git_hosting/_gitolite_config_file.html.haml @@ -25,7 +25,10 @@ = bootstrap_switch_tag do = hidden_field_tag 'settings[gitolite_identifier_strip_user_id]', "#{disable_button}" = check_box_tag 'settings[gitolite_identifier_strip_user_id]', gitolite_identifier_strip_user_id, gitolite_identifier_strip_user_id, { disabled: disable_button } - + %br + %em + = surround '(', ')' do + = l(:label_gitolite_identifier_strip_user_id_desc) %br .git_hosting_access_box diff --git a/config/locales/settings/en.yml b/config/locales/settings/en.yml index 70d488a96..ee7670695 100644 --- a/config/locales/settings/en.yml +++ b/config/locales/settings/en.yml @@ -37,6 +37,7 @@ en: label_gitolite_identifier_prefix: Gitolite prefix label_gitolite_identifier_prefix_desc: Will be used to generate SSH keys identifiers label_gitolite_identifier_strip_user_id: Remove user ID from Gitolite identifier + label_gitolite_identifier_strip_user_id_desc: You must restart Redmine to take effects # Gitolite Global Config label_tab_global: Global diff --git a/config/locales/settings/fr.yml b/config/locales/settings/fr.yml index 6c2b1cf6c..50a7035d0 100644 --- a/config/locales/settings/fr.yml +++ b/config/locales/settings/fr.yml @@ -37,6 +37,7 @@ fr: label_gitolite_identifier_prefix: Préfixe Gitolite label_gitolite_identifier_prefix_desc: Sera utilisé pour générer les identifiants de clé SSH label_gitolite_identifier_strip_user_id: Supprimer l'ID de l'utilisateur de l'identifiant Gitolite + label_gitolite_identifier_strip_user_id_desc: Vous devrez redémarrer Redmine pour que le changement soit pris en compte # Gitolite Global Config label_tab_global: Global