Skip to content

Commit 79efb6c

Browse files
author
root
committed
Fix #336
This also reverts previous commit
1 parent ec11e79 commit 79efb6c

File tree

9 files changed

+592
-262
lines changed

9 files changed

+592
-262
lines changed

Diff for: app/helpers/gitolite_plugin_settings_helper.rb

-16
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,6 @@ def render_gitolite_version(version)
3131
end
3232

3333

34-
def render_git_version(version)
35-
major = version.split('.')[0].to_i
36-
minor = version.split('.')[1].to_i
37-
patch = version.split('.')[2].to_i
38-
# Git 1.7 : incompatible
39-
if major == 1 && minor < 8
40-
content_tag(:span, version, class: 'label label-important') + content_tag(:span, l(:label_incompatible_git_version), class: 'git-version')
41-
# Git 1.8.x to 1.8.5 : incompatible
42-
elsif major == 1 && minor == 8 && patch < 5
43-
content_tag(:span, version, class: 'label label-important') + content_tag(:span, l(:label_incompatible_git_version), class: 'git-version')
44-
else
45-
content_tag(:span, version, class: 'label label-success')
46-
end
47-
end
48-
49-
5034
def render_temp_dir_writeable(state, label)
5135
css_class = state ? 'label label-success' : 'label label-important'
5236
content_tag(:span, label, class: css_class)

Diff for: app/views/settings/_gitolite_config_test.html.haml

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444

4545
%tr
4646
%td= l(:label_git_version)
47-
%td= render_git_version(Repository::Xitolite.scm_version_string)
47+
%td
48+
%span{ class: 'label label-success' }= Repository::Xitolite.scm_version_string
4849

4950
%tr
5051
%td= l(:label_gitolite_version)

Diff for: assets/stylesheets/application.css

-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ PLUGIN SETTINGS
5858
margin-top: 15px;
5959
}
6060

61-
.git-version {
62-
font-style: italic;
63-
padding-left: 10px;
64-
}
6561

6662
/*
6763
REPOSITORY EDIT

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

-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ en:
162162
label_redmine_user: Redmine username
163163
label_git_version: Git version
164164
label_gitolite_repository_count: Count of physical repositories in Gitolite
165-
label_incompatible_git_version: Incompatible Git version!
166165

167166
# Recycle Bin
168167
label_tab_gitolite_recycle_bin: Recycle Bin

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

-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ fr:
162162
label_redmine_user: Nom d'utilisateur Redmine
163163
label_git_version: Version de Git
164164
label_gitolite_repository_count: Nombre de dépôts physiques dans Gitolite
165-
label_incompatible_git_version: Version de Git incompatible!
166165

167166
# Recycle Bin
168167
label_tab_gitolite_recycle_bin: Corbeille

0 commit comments

Comments
 (0)