Merged r15989 and r15991 (#24283).

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

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 67cfcd2e305e5afa79ff6c1ed1636a74668243e9..289d73ee90295eb3e5082c9866b2157b5ea3fff5 100644 (file)
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -31,6 +31,7 @@ class CustomField < ActiveRecord::Base
   validates_presence_of :name, :field_format
   validates_uniqueness_of :name, :scope => :type
   validates_length_of :name, :maximum => 30
+  validates_length_of :regexp, maximum: 30
   validates_inclusion_of :field_format, :in => Proc.new { Redmine::FieldFormat.available_formats }
   validate :validate_custom_field
   attr_protected :id

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3e46570eeed5039a3f5ec405be62a08dc70e42eb..90c2e49aca301f68f27b24d355287f51fc1058e5 100644 (file)
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -37,7 +37,9 @@ class Repository < ActiveRecord::Base
   # has_many :changesets, :dependent => :destroy is too slow for big repositories
   before_destroy :clear_changesets
 
+  validates_length_of :login, maximum: 60, allow_nil: true
   validates_length_of :password, :maximum => 255, :allow_nil => true
+  validates_length_of :root_url, :url, maximum: 255
   validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH, :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)

diff --git a/app/models/user.rb b/app/models/user.rb
index 7df9f2d57a01ec14fc47ab4117e2c8175b346239..65fb8abf9423d07814925370228720d776bc1e2c 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -104,6 +104,7 @@ class User < Principal
   validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i
   validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT
   validates_length_of :firstname, :lastname, :maximum => 30
+  validates_length_of :identity_url, maximum: 255
   validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
   validate :validate_password_length
   validate do

diff --git a/app/models/version.rb b/app/models/version.rb
index cb28426b4563034cbb47d6efd9a8c29531a58a97..bfb1832e6690acf5a5bc8c2071baee8f5b08bade 100644 (file)
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -34,7 +34,7 @@ class Version < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]
   validates_length_of :name, :maximum => 60
-  validates_length_of :description, :maximum => 255
+  validates_length_of :description, :wiki_page_title, :maximum => 255
   validates :effective_date, :date => true
   validates_inclusion_of :status, :in => VERSION_STATUSES
   validates_inclusion_of :sharing, :in => VERSION_SHARINGS

diff --git a/app/models/wiki.rb b/app/models/wiki.rb
index 188cb5b6cea7f5b266237fc74451b4a22e286f6b..b4cf76595cc2981b7128143207dfcd3994da56b2 100644 (file)
--- a/app/models/wiki.rb
+++ b/app/models/wiki.rb
@@ -25,6 +25,7 @@ class Wiki < ActiveRecord::Base
 
   validates_presence_of :start_page
   validates_format_of :start_page, :with => /\A[^,\.\/\?\;\|\:]*\z/
+  validates_length_of :start_page, maximum: 255
   attr_protected :id
 
   before_destroy :delete_redirects

diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index ae1e74cca90827e1ebf676f24c59e6a1fdcb0c28..9922fa4be4c4ed6cb03d7d5e98a27efdd4b85248 100644 (file)
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -45,6 +45,7 @@ class WikiPage < ActiveRecord::Base
   validates_presence_of :title
   validates_format_of :title, :with => /\A[^,\.\/\?\;\|\s]*\z/
   validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
+  validates_length_of :title, maximum: 255
   validates_associated :content
   attr_protected :id