No more need of Gitolite timeout

Author: root

Diff for: app/views/settings/_gitolite_config_global.html.erb

@@ -3,7 +3,6 @@
   gitolite_recycle_bin_expiration_time = RedmineGitolite::Config.get_setting(:gitolite_recycle_bin_expiration_time)
 
   gitolite_temp_dir    = RedmineGitolite::Config.get_setting(:gitolite_temp_dir)
-  gitolite_timeout     = RedmineGitolite::Config.get_setting(:gitolite_timeout)
   gitolite_log_level   = RedmineGitolite::Config.get_setting(:gitolite_log_level)
   gitolite_log_split   = RedmineGitolite::Config.get_setting(:gitolite_log_split)
 
@@ -20,13 +19,6 @@
   <em><%= l(:label_gitolite_temp_dir_desc) %></em>
 </p>
 
-<p>
-  <label><%= l(:label_gitolite_timeout) %></label>
-  <%= text_field_tag("settings[gitolite_timeout]", "#{gitolite_timeout}", :size => 10) %>
-  <br />
-  <em><%= l(:label_gitolite_timeout_desc) %></em>
-</p>
-
 <p>
   <label><%= l(:label_gitolite_recycle_bin_expiration_time) %></label>
   <%= text_field_tag("settings[gitolite_recycle_bin_expiration_time]", gitolite_recycle_bin_expiration_time, :size => 10) %>

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

@@ -43,8 +43,6 @@ en:
 
   label_gitolite_temp_dir: Temporary dir for lock file and data
   label_gitolite_temp_dir_desc: (Must be absolute)
-  label_gitolite_timeout: Git timeout
-  label_gitolite_timeout_desc: (In seconds)
 
   label_gitolite_recycle_bin_expiration_time: Expiration time for repositories in recycle bin
   label_gitolite_recycle_bin_expiration_time_desc: (In hours)

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

@@ -43,8 +43,6 @@ fr:
 
   label_gitolite_temp_dir: Répertoire temporaire pour les fichiers de verrouillage et les données
   label_gitolite_temp_dir_desc: (Doit être absolu)
-  label_gitolite_timeout: Délai d'expiration Git
-  label_gitolite_timeout_desc: (En secondes)
 
   label_gitolite_recycle_bin_expiration_time: Temps d'expiration pour les dépôts dans la corbeille
   label_gitolite_recycle_bin_expiration_time_desc: (En heures)

Diff for: db/migrate/20130807223227_migrate_parameters.rb

@@ -15,7 +15,6 @@ def self.up
 
     new_setting[:gitolite_temp_dir]                    = File.join(Rails.root, 'tmp', 'redmine_git_hosting').to_s
     new_setting[:gitolite_script_dir]                  = './'
-    new_setting[:gitolite_timeout]                     = 10
     new_setting[:gitolite_config_file]                 = 'gitolite.conf'
     new_setting[:gitolite_config_has_admin_key]        = true
     new_setting[:gitolite_recycle_bin_expiration_time] = 24.0
@@ -98,9 +97,6 @@ def self.up
           when 'gitRecycleExpireTime' then
             new_setting[:gitolite_recycle_bin_expiration_time] = value
 
-          when 'gitLockWaitTime' then
-            new_setting[:gitolite_timeout] = value
-
           # Gitolite Hooks Config
           when 'gitHooksAreAsynchronous' then
             new_setting[:gitolite_hooks_are_asynchronous] = value

Diff for: init.rb

@@ -33,7 +33,6 @@
 
       # Gitolite Global Config
       :gitolite_temp_dir                     => File.join(Rails.root, 'tmp', 'redmine_git_hosting', '/').to_s,
-      :gitolite_timeout                      => 10,
       :gitolite_recycle_bin_expiration_time  => 24.0,
       :gitolite_log_level                    => 'info',
       :gitolite_log_split                    => false,

Diff for: lib/redmine_git_hosting/patches/setting_patch.rb

@@ -222,16 +222,6 @@ def save_git_hosting_values
             end
 
 
-            # Validate gitolite_timeout > 0 and < 30 (and exclude non-numbers)
-            if valuehash[:gitolite_timeout]
-              if valuehash[:gitolite_timeout].to_i > 0 and valuehash[:gitolite_timeout].to_i < 30
-                valuehash[:gitolite_timeout] = "#{valuehash[:gitolite_timeout].to_i}"
-              else
-                valuehash[:gitolite_timeout] = @@old_valuehash[:gitolite_timeout]
-              end
-            end
-
-
             ## This a force update
             if valuehash[:gitolite_resync_all_projects] == 'true'
               @@resync_projects = true