jro_apps/redmine Commit - r13765:c6c304edf1e3

Merged r14142 and r14143 (#19400)....

Jean-Philippe Lang -

r13765:c6c304edf1e3

parent child

Context file:

r13765:c6c304edf1e3

app/models/repository.rb +1 -1

               validates_length_of :password, :maximum => 255, :allow_nil => true
               validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH, :allow_blank => true
-              validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true
+              validates_uniqueness_of :identifier, :scope => :project_id
               validates_exclusion_of :identifier, :in => %w(browse show entry raw changes annotate diff statistics graph revisions revision)
               # donwcase letters, digits, dashes, underscores but not digits only
               validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/, :allow_blank => true

app/models/repository/git.rb +2 -2

                 end
                 h["heads"] = repo_heads.dup
                 merge_extra_info(h)
-                self.save
+                save(:validate => false)
               end
               private :save_revisions
                 h = {}
                 h["extra_report_last_commit"] = v
                 merge_extra_info(h)
-                self.save
+                save(:validate => false)
               end
               private :clear_extra_info_of_changesets
             end

test/unit/repository_test.rb +18 0

@@ -76,6 +76,24 class RepositoryTest < ActiveSupport::TestCase
76	assert_equal repository, project.repository	76	assert_equal repository, project.repository
77	end	77	end
78		78
		79	def test_2_repositories_with_same_identifier_in_different_projects_should_be_valid
		80	Repository::Subversion.create!(:project_id => 2, :identifier => 'foo', :url => 'file:///foo')
		81	r = Repository::Subversion.new(:project_id => 3, :identifier => 'foo', :url => 'file:///bar')
		82	assert r.save
		83	end
		84
		85	def test_2_repositories_with_same_identifier_should_not_be_valid
		86	Repository::Subversion.create!(:project_id => 3, :identifier => 'foo', :url => 'file:///foo')
		87	r = Repository::Subversion.new(:project_id => 3, :identifier => 'foo', :url => 'file:///bar')
		88	assert !r.save
		89	end
		90
		91	def test_2_repositories_with_blank_identifier_should_not_be_valid
		92	Repository::Subversion.create!(:project_id => 3, :identifier => '', :url => 'file:///foo')
		93	r = Repository::Subversion.new(:project_id => 3, :identifier => '', :url => 'file:///bar')
		94	assert !r.save
		95	end
		96
79	def test_first_repository_should_be_set_as_default	97	def test_first_repository_should_be_set_as_default
80	repository1 = Repository::Subversion.new(	98	repository1 = Repository::Subversion.new(
81	:project => Project.find(3),	99	:project => Project.find(3),

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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