Skip to content

Commit 91ea8ca

Browse files
authored
Merge pull request #636 from eole/strip-id-require-restart
“Remove user ID from Gitolite identifier” requires a restart
2 parents b436a02 + 90de5f9 commit 91ea8ca

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

Diff for: app/views/settings/redmine_git_hosting/_gitolite_config_file.html.haml

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
= bootstrap_switch_tag do
2626
= hidden_field_tag 'settings[gitolite_identifier_strip_user_id]', "#{disable_button}"
2727
= check_box_tag 'settings[gitolite_identifier_strip_user_id]', gitolite_identifier_strip_user_id, gitolite_identifier_strip_user_id, { disabled: disable_button }
28-
28+
%br
29+
%em
30+
= surround '(', ')' do
31+
= l(:label_gitolite_identifier_strip_user_id_desc)
2932
%br
3033

3134
.git_hosting_access_box

Diff for: config/locales/settings/en.yml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ en:
3737
label_gitolite_identifier_prefix: Gitolite prefix
3838
label_gitolite_identifier_prefix_desc: Will be used to generate SSH keys identifiers
3939
label_gitolite_identifier_strip_user_id: Remove user ID from Gitolite identifier
40+
label_gitolite_identifier_strip_user_id_desc: You must restart Redmine to take effects
4041

4142
# Gitolite Global Config
4243
label_tab_global: Global

Diff for: config/locales/settings/fr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ fr:
3737
label_gitolite_identifier_prefix: Préfixe Gitolite
3838
label_gitolite_identifier_prefix_desc: Sera utilisé pour générer les identifiants de clé SSH
3939
label_gitolite_identifier_strip_user_id: Supprimer l'ID de l'utilisateur de l'identifiant Gitolite
40+
label_gitolite_identifier_strip_user_id_desc: Vous devrez redémarrer Redmine pour que le changement soit pris en compte
4041

4142
# Gitolite Global Config
4243
label_tab_global: Global

0 commit comments

Comments
 (0)