Rename :gitolite_force_hooks_update to :gitolite_overwrite_existing_hooks setting to be more explicit

Author: root

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

@@ -1,8 +1,8 @@
 / Gitolite Hooks Config
-- gitolite_hooks_are_asynchronous = RedmineGitHosting::Config.get_setting(:gitolite_hooks_are_asynchronous, true)
-- gitolite_force_hooks_update     = RedmineGitHosting::Config.get_setting(:gitolite_force_hooks_update, true)
-- gitolite_hooks_debug            = RedmineGitHosting::Config.get_setting(:gitolite_hooks_debug, true)
-- gitolite_hooks_url              = RedmineGitHosting::Config.get_setting(:gitolite_hooks_url)
+- gitolite_overwrite_existing_hooks = RedmineGitHosting::Config.get_setting(:gitolite_overwrite_existing_hooks, true)
+- gitolite_hooks_are_asynchronous   = RedmineGitHosting::Config.get_setting(:gitolite_hooks_are_asynchronous, true)
+- gitolite_hooks_debug              = RedmineGitHosting::Config.get_setting(:gitolite_hooks_debug, true)
+- gitolite_hooks_url                = RedmineGitHosting::Config.get_setting(:gitolite_hooks_url)
 
 .contextual= link_to label_with_icon(l(:label_install_gitolite_hooks), 'fa-rocket', class: 'fa-align'), install_gitolite_hooks_path('redmine_git_hosting'), remote: true
 
@@ -12,16 +12,16 @@
   .row
     .col-md-6{ style: 'vertical-align: top;' }
       %p
-        %label= l(:label_gitolite_hooks_are_asynchronous)
+        %label= l(:label_gitolite_overwrite_existing_hooks)
         = bootstrap_switch_tag do
-          = hidden_field_tag 'settings[gitolite_hooks_are_asynchronous]', 'false'
-          = check_box_tag 'settings[gitolite_hooks_are_asynchronous]', gitolite_hooks_are_asynchronous, gitolite_hooks_are_asynchronous
+          = hidden_field_tag 'settings[gitolite_overwrite_existing_hooks]', 'false'
+          = check_box_tag 'settings[gitolite_overwrite_existing_hooks]', gitolite_overwrite_existing_hooks, gitolite_overwrite_existing_hooks
 
       %p
-        %label= l(:label_gitolite_force_hooks_update)
+        %label= l(:label_gitolite_hooks_are_asynchronous)
         = bootstrap_switch_tag do
-          = hidden_field_tag 'settings[gitolite_force_hooks_update]', 'false'
-          = check_box_tag 'settings[gitolite_force_hooks_update]', gitolite_force_hooks_update, gitolite_force_hooks_update
+          = hidden_field_tag 'settings[gitolite_hooks_are_asynchronous]', 'false'
+          = check_box_tag 'settings[gitolite_hooks_are_asynchronous]', gitolite_hooks_are_asynchronous, gitolite_hooks_are_asynchronous
 
       %p
         %label= l(:label_gitolite_hooks_debug)

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

@@ -82,8 +82,8 @@ en:
   label_tab_hooks: Hooks
   label_gitolite_hooks_config: Gitolite Hooks Configuration
 
+  label_gitolite_overwrite_existing_hooks: Overwrite existing hooks
   label_gitolite_hooks_are_asynchronous: Run hooks asynchronously
-  label_gitolite_force_hooks_update: Force hooks to be updated
   label_gitolite_hooks_debug: Run hooks in Debug mode
   label_gitolite_hooks_url: Hooks URL
   label_gitolite_hooks_namespace: Hooks Git namespace

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

@@ -82,8 +82,8 @@ fr:
   label_tab_hooks: Hooks
   label_gitolite_hooks_config: Configuration des hooks de Gitolite
 
+  label_gitolite_overwrite_existing_hooks: Ecraser les hooks existants
   label_gitolite_hooks_are_asynchronous: Lancer les hooks de manière asynchrone
-  label_gitolite_force_hooks_update: Forcer la mise à jour des hooks
   label_gitolite_hooks_debug: Lancer les hooks en mode debug
   label_gitolite_hooks_url: URL des hooks
   label_gitolite_hooks_namespace: Espace de nom Git des hooks

Diff for: db/migrate/20130807223227_migrate_parameters.rb

@@ -20,9 +20,9 @@ def self.up
       :gitolite_config_has_admin_key        => 'true',
       :gitolite_recycle_bin_expiration_time => '24.0',
 
-      :gitolite_hooks_debug            => 'false',
-      :gitolite_force_hooks_update     => 'true',
-      :gitolite_hooks_are_asynchronous => 'false',
+      :gitolite_overwrite_existing_hooks => 'true',
+      :gitolite_hooks_are_asynchronous   => 'false',
+      :gitolite_hooks_debug              => 'false',
 
       :gitolite_cache_max_time     => '86400',
       :gitolite_cache_max_size     => '16',
@@ -114,7 +114,7 @@ def self.up
             new_setting[:gitolite_hooks_are_asynchronous] = value
 
           when 'gitForceHooksUpdate' then
-            new_setting[:gitolite_force_hooks_update] = value
+            new_setting[:gitolite_overwrite_existing_hooks] = value
 
           when 'gitHooksDebug' then
             new_setting[:gitolite_hooks_debug] = value

Diff for: init.rb

@@ -40,10 +40,10 @@
       :git_config_email                      => '[email protected]',
 
       # Gitolite Hooks Config
-      :gitolite_hooks_are_asynchronous  => 'false',
-      :gitolite_force_hooks_update      => 'true',
-      :gitolite_hooks_debug             => 'false',
-      :gitolite_hooks_url               => 'http://localhost:3000',
+      :gitolite_overwrite_existing_hooks => 'true',
+      :gitolite_hooks_are_asynchronous   => 'false',
+      :gitolite_hooks_debug              => 'false',
+      :gitolite_hooks_url                => 'http://localhost:3000',
 
       # Gitolite Cache Config
       :gitolite_cache_max_time          => '86400',

Diff for: lib/redmine_git_hosting/config/gitolite_hooks.rb

@@ -31,8 +31,8 @@ def gitolite_hooks_are_asynchronous
       end
 
 
-      def gitolite_force_hooks_update?
-        RedmineGitHosting::Config.get_setting(:gitolite_force_hooks_update, true)
+      def gitolite_overwrite_existing_hooks?
+        RedmineGitHosting::Config.get_setting(:gitolite_overwrite_existing_hooks, true)
       end
 
 

Diff for: lib/redmine_git_hosting/gitolite_hook.rb

@@ -22,7 +22,7 @@ def def_field(*names)
 
     def initialize(source_dir, &block)
       @source_dir   = source_dir
-      @force_update = RedmineGitHosting::Config.gitolite_force_hooks_update?
+      @force_update = RedmineGitHosting::Config.gitolite_overwrite_existing_hooks?
       instance_eval(&block)
     end