<%= setting_text_field :commit_ref_keywords, :size => 30 %> <%= l(:text_comma_separated) %>
-<%= setting_text_field :commit_fix_keywords, :size => 30 %> - <%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id, - [["", 0]] + - IssueStatus.find(:all).collect{ - |status| [status.name, status.id.to_s] - }, - :label => false %> - <%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio, - (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, - :blank => :label_no_change_option, - :label => false %> +
<%= setting_text_field :commit_update1_keywords, :size => 30 %>
+ <%= l(:label_applied_status) %>: <%= setting_select :commit_update1_status_id, [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, :label => false %>
+ <%= l(:field_done_ratio) %>: <%= setting_select :commit_update1_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
+
<%= l(:text_comma_separated) %>
<%= setting_text_field :commit_update2_keywords, :size => 30 %>
+ <%= l(:label_applied_status) %>: <%= setting_select :commit_update2_status_id, [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, :label => false %>
+ <%= l(:field_done_ratio) %>: <%= setting_select :commit_update2_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
+
<%= l(:text_comma_separated) %>
<%= setting_text_field :commit_update3_keywords, :size => 30 %>
+ <%= l(:label_applied_status) %>: <%= setting_select :commit_update3_status_id, [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, :label => false %>
+ <%= l(:field_done_ratio) %>: <%= setting_select :commit_update3_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
+
<%= l(:text_comma_separated) %>
<%= setting_text_field :commit_update4_keywords, :size => 30 %>
+ <%= l(:label_applied_status) %>: <%= setting_select :commit_update4_status_id, [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, :label => false %>
+ <%= l(:field_done_ratio) %>: <%= setting_select :commit_update4_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
+
<%= l(:text_comma_separated) %>
<%= setting_text_field :commit_update5_keywords, :size => 30 %> + <%= l(:label_applied_status) %>: <%= setting_select :commit_update5_status_id, [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, :label => false %> + <%= l(:field_done_ratio) %>: <%= setting_select :commit_update5_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %> + <%= l(:text_comma_separated) %>
<%= setting_check_box :commit_cross_project_ref %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 6c13393..22fa88d 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -343,7 +343,11 @@ en: setting_autofetch_changesets: Fetch commits automatically setting_sys_api_enabled: Enable WS for repository management setting_commit_ref_keywords: Referencing keywords - setting_commit_fix_keywords: Fixing keywords + setting_commit_update1_keywords: Keywords + setting_commit_update2_keywords: Keywords + setting_commit_update3_keywords: Keywords + setting_commit_update4_keywords: Keywords + setting_commit_update5_keywords: Keywords setting_autologin: Autologin setting_date_format: Date format setting_time_format: Time format @@ -932,7 +936,7 @@ en: text_unallowed_characters: Unallowed characters text_comma_separated: Multiple values allowed (comma separated). text_line_separated: Multiple values allowed (one line for each value). - text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages + text_issues_ref_in_commit_messages: Referencing and updating issues in commit messages text_issue_added: "Issue %{id} has been reported by %{author}." text_issue_updated: "Issue %{id} has been updated by %{author}." text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content? diff --git a/config/settings.yml b/config/settings.yml index 66bc78e..ab49afa 100755 --- a/config/settings.yml +++ b/config/settings.yml @@ -94,16 +94,50 @@ sys_api_enabled: default: 0 sys_api_key: default: '' +# commit actions commit_cross_project_ref: default: 0 commit_ref_keywords: default: 'refs,references,IssueID' -commit_fix_keywords: +# commit update 1 +commit_update1_keywords: default: 'fixes,closes' -commit_fix_status_id: +commit_update1_status_id: format: int default: 0 -commit_fix_done_ratio: +commit_update1_done_ratio: + default: 100 +# commit update 2 +commit_update2_keywords: + default: '' +commit_update2_status_id: + format: int + default: 0 +commit_update2_done_ratio: + default: 100 +# commit update 3 +commit_update3_keywords: + default: '' +commit_update3_status_id: + format: int + default: 0 +commit_update3_done_ratio: + default: 100 +# commitupdate 4 +commit_update4_keywords: + default: '' +commit_update4_status_id: + format: int + default: 0 +commit_update4_done_ratio: + default: 100 +# commit update 5 +commit_update5_keywords: + default: '' +commit_update5_status_id: + format: int + default: 0 +commit_update5_done_ratio: default: 100 commit_logtime_enabled: default: 0