From 23b322772d42158fa16ec99c0032b88f1cc810ab 2014-05-24 16:28:39 From: Jean-Philippe Lang Date: 2014-05-24 16:28:39 Subject: [PATCH] Merged r13127 (#16564). git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13154 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/repository.rb b/app/models/repository.rb index cfdfba5..1b469c0 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -40,7 +40,7 @@ class Repository < ActiveRecord::Base validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH, :allow_blank => true validates_presence_of :identifier, :unless => Proc.new { |r| r.is_default? || r.set_as_default? } validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true - validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph) + 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 # Checks if the SCM is enabled when creating a repository