jro_apps/redmine Commit - r8630:d02f6a8e32d1

0

app/models/changeset.rb +4 -2

               private
               # Finds an issue that can be referenced by the commit message
-              # i.e. an issue that belong to the repository project, a subproject or a parent project
               def find_referenced_issue_by_id(id)
                 return nil if id.blank?
                 issue = Issue.find_by_id(id.to_i, :include => :project)
-                if issue
+                if Setting.commit_cross_project_ref?
+                  # all issues can be referenced/fixed
+                elsif issue
+                  # issue that belong to the repository project, a subproject or a parent project only
                   unless issue.project &&
                             (project == issue.project || project.is_ancestor_of?(issue.project) ||
                              project.is_descendant_of?(issue.project))

0

app/views/settings/_repositories.html.erb +2 0

                                                                    :label => false %>
             <br /><em><%= l(:text_comma_separated) %></em></p>
+            <p><%= setting_check_box :commit_cross_project_ref %></p>
             <p><%= setting_check_box :commit_logtime_enabled,
                                      :onclick =>
                                         "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>

0

config/locales/ar.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/bg.yml +1 0

               description_date_range_interval: Изберете диапазон чрез задаване на начална и крайна дати
               description_date_from: Въведете начална дата
               description_date_to: Въведете крайна дата
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/bs.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/ca.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/cs.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/da.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/de.yml +1 0

               label_item_position: "%{position}/%{count}"
               label_completed_versions: Completed versions
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/el.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/en-GB.yml +1 0

               label_item_position: "%{position} of %{count}"
               label_completed_versions: Completed versions
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/en.yml +1 0

               setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
               setting_issue_group_assignment: Allow issue assignment to groups
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
               permission_add_project: Create project
               permission_add_subprojects: Create subprojects

0

config/locales/es.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/eu.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/fa.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/fi.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/fr.yml +1 0

               setting_gantt_items_limit: Nombre maximum d'éléments affichés sur le gantt
               setting_issue_group_assignment: Permettre l'assignement des demandes aux groupes
               setting_default_issue_start_date_to_creation_date: Donner à la date de début d'une nouvelle demande la valeur de la date du jour
+              setting_commit_cross_project_ref: Permettre le référencement et la résolution des demandes de tous les autres projets
               permission_add_project: Créer un projet
               permission_add_subprojects: Créer des sous-projets

0

config/locales/gl.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/he.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/hr.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/hu.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/id.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/it.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/ja.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/ko.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/lt.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/lv.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/mk.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/mn.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/nl.yml +1 0

               label_item_position: "%{position}/%{count}"
               label_completed_versions: Completed versions
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/no.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/pl.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/pt-BR.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/pt.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/ro.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/ru.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/sk.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/sl.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/sr-YU.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/sr.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/sv.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/th.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/tr.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/uk.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/vi.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/zh-TW.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/locales/zh.yml +1 0

               label_completed_versions: Completed versions
               text_project_identifier_info: Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.
               field_multiple: Multiple values
+              setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed

0

config/settings.yml +2 0

               default: 0
             sys_api_key:
               default: ''
+            commit_cross_project_ref:
+              default: 0
             commit_ref_keywords:
               default: 'refs,references,IssueID'
             commit_fix_keywords:

0

test/unit/changeset_test.rb +30 0

@@ -192,6 +192,36 class ChangesetTest < ActiveSupport::TestCase
192	assert c.issues.first.project != c.project	192	assert c.issues.first.project != c.project
193	end	193	end
194		194
		195	def test_commit_referencing_a_project_with_commit_cross_project_ref_disabled
		196	r = Repository::Subversion.create!(
		197	:project => Project.find(3),
		198	:url => 'svn://localhost/test')
		199
		200	with_settings :commit_cross_project_ref => '0' do
		201	c = Changeset.new(:repository => r,
		202	:committed_on => Time.now,
		203	:comments => 'refs #4, an issue of a different project',
		204	:revision => '12345')
		205	assert c.save
		206	assert_equal [], c.issue_ids
		207	end
		208	end
		209
		210	def test_commit_referencing_a_project_with_commit_cross_project_ref_enabled
		211	r = Repository::Subversion.create!(
		212	:project => Project.find(3),
		213	:url => 'svn://localhost/test')
		214
		215	with_settings :commit_cross_project_ref => '1' do
		216	c = Changeset.new(:repository => r,
		217	:committed_on => Time.now,
		218	:comments => 'refs #4, an issue of a different project',
		219	:revision => '12345')
		220	assert c.save
		221	assert_equal [4], c.issue_ids
		222	end
		223	end
		224
195	def test_text_tag_revision	225	def test_text_tag_revision
196	c = Changeset.new(:revision => '520')	226	c = Changeset.new(:revision => '520')
197	assert_equal 'r520', c.text_tag	227	assert_equal 'r520', c.text_tag

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages