Merged r14142 and r14143 (#19400).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14148 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 36ed06b7f489f38145378d47ccc007f6e4377dd0..a439e989e6ddbcb194b0c149d2c6511caa9f2b1f 100644 (file)
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -38,7 +38,7 @@ class Repository < ActiveRecord::Base
 
   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

diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
index 474032a076d41d75aa88cc01b9462d83977829d1..b9ac27732847acc0d2ff5a43baede88e426fe76c 100644 (file)
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -209,7 +209,7 @@ class Repository::Git < Repository
     end
     h["heads"] = repo_heads.dup
     merge_extra_info(h)
-    self.save
+    save(:validate => false)
   end
   private :save_revisions
 
@@ -251,7 +251,7 @@ class Repository::Git < Repository
     h = {}
     h["extra_report_last_commit"] = v
     merge_extra_info(h)
-    self.save
+    save(:validate => false)
   end
   private :clear_extra_info_of_changesets
 end

diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 458d8ac53f9239f83ff304f559228995f47a708f..3ba36fd55136cd151f5b317abeb7c54e926ee220 100644 (file)
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -76,6 +76,24 @@ class RepositoryTest < ActiveSupport::TestCase
     assert_equal repository, project.repository
   end
 
+  def test_2_repositories_with_same_identifier_in_different_projects_should_be_valid
+    Repository::Subversion.create!(:project_id => 2, :identifier => 'foo', :url => 'file:///foo')
+    r = Repository::Subversion.new(:project_id => 3, :identifier => 'foo', :url => 'file:///bar')
+    assert r.save
+  end
+
+  def test_2_repositories_with_same_identifier_should_not_be_valid
+    Repository::Subversion.create!(:project_id => 3, :identifier => 'foo', :url => 'file:///foo')
+    r = Repository::Subversion.new(:project_id => 3, :identifier => 'foo', :url => 'file:///bar')
+    assert !r.save
+  end
+
+  def test_2_repositories_with_blank_identifier_should_not_be_valid
+    Repository::Subversion.create!(:project_id => 3, :identifier => '', :url => 'file:///foo')
+    r = Repository::Subversion.new(:project_id => 3, :identifier => '', :url => 'file:///bar')
+    assert !r.save
+  end
+
   def test_first_repository_should_be_set_as_default
     repository1 = Repository::Subversion.new(
                       :project => Project.find(3),