Merge branch 'devel' into v1.x

Author: Nicolas Rodriguez

app/helpers/gitolite_plugin_settings_helper.rb

@@ -31,6 +31,22 @@ def render_gitolite_version(version)
   end
 
 
+  def render_git_version(version)
+    major = version.split('.')[0].to_i
+    minor = version.split('.')[1].to_i
+    patch = version.split('.')[2].to_i
+    # Git 1.7 : incompatible
+    if major == 1 && minor < 8
+      content_tag(:span, version, class: 'label label-important') + content_tag(:span, l(:label_incompatible_git_version), class: 'git-version')
+    # Git 1.8.x to 1.8.5 : incompatible
+    elsif major == 1 && minor == 8 && patch < 5
+      content_tag(:span, version, class: 'label label-important') + content_tag(:span, l(:label_incompatible_git_version), class: 'git-version')
+    else
+      content_tag(:span, version, class: 'label label-success')
+    end
+  end
+
+
   def render_temp_dir_writeable(state, label)
     css_class = state ? 'label label-success' : 'label label-important'
     content_tag(:span, label, class: css_class)

app/views/settings/_gitolite_config_test.html.haml

@@ -44,8 +44,7 @@
 
   %tr
     %td= l(:label_git_version)
-    %td
-      %span{ class: 'label label-success' }= Repository::Xitolite.scm_version_string
+    %td= render_git_version(Repository::Xitolite.scm_version_string)
 
   %tr
     %td= l(:label_gitolite_version)

assets/stylesheets/application.css

@@ -58,6 +58,10 @@ PLUGIN SETTINGS
   margin-top: 15px;
 }
 
+.git-version {
+  font-style: italic;
+  padding-left: 10px;
+}
 
 /*
 REPOSITORY EDIT

config/locales/settings/en.yml

@@ -162,6 +162,7 @@ en:
   label_redmine_user: Redmine username
   label_git_version: Git version
   label_gitolite_repository_count: Count of physical repositories in Gitolite
+  label_incompatible_git_version: Incompatible Git version!
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Recycle Bin

config/locales/settings/fr.yml

@@ -162,6 +162,7 @@ fr:
   label_redmine_user: Nom d'utilisateur Redmine
   label_git_version: Version de Git
   label_gitolite_repository_count: Nombre de dépôts physiques dans Gitolite
+  label_incompatible_git_version: Version de Git incompatible!
 
   # Recycle Bin
   label_tab_gitolite_recycle_bin: Corbeille