From 7b3e3172c4082b487122151e92a1371f86bfd81c Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Sun, 28 Mar 2021 21:03:54 +0300 Subject: [PATCH 01/19] Fix 'DEPRECATION WARNING: Uniqueness validator will no longer enforce case sensitive comparison in Rails 6.1. (#29914, #32897)' --- Gemfile | 2 +- app/models/auth_source.rb | 2 +- app/models/changeset.rb | 4 ++-- app/models/custom_field.rb | 2 +- app/models/enabled_module.rb | 2 +- app/models/enumeration.rb | 2 +- app/models/issue_category.rb | 2 +- app/models/issue_relation.rb | 2 +- app/models/issue_status.rb | 2 +- app/models/member.rb | 2 +- app/models/project.rb | 2 +- app/models/repository.rb | 2 +- app/models/role.rb | 2 +- app/models/setting.rb | 1 + app/models/token.rb | 2 +- app/models/tracker.rb | 2 +- app/models/version.rb | 2 +- app/models/watcher.rb | 2 +- 18 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 443cd04d7..7ee5521de 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.5' +gem 'rails', '6.1.3.1' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'rouge', '~> 3.26.0' gem 'request_store', '~> 1.5.0' diff --git a/app/models/auth_source.rb b/app/models/auth_source.rb index 0e4b03450..cc9663112 100644 --- a/app/models/auth_source.rb +++ b/app/models/auth_source.rb @@ -30,7 +30,7 @@ class AuthSource < ActiveRecord::Base has_many :users validates_presence_of :name - validates_uniqueness_of :name + validates_uniqueness_of :name, :case_sensitive => true validates_length_of :name, :maximum => 60 safe_attributes( diff --git a/app/models/changeset.rb b/app/models/changeset.rb index f1580ce33..da40bbb63 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -52,8 +52,8 @@ class Changeset < ActiveRecord::Base :scope => proc {preload(:user, {:repository => :project})} validates_presence_of :repository_id, :revision, :committed_on, :commit_date - validates_uniqueness_of :revision, :scope => :repository_id - validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true + validates_uniqueness_of :revision, :scope => :repository_id, :case_sensitive => true + validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true, :case_sensitive => true scope :visible, (lambda do |*args| joins(:repository => :project). diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index ed44d552c..9787b2ee4 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -34,7 +34,7 @@ class CustomField < ActiveRecord::Base store :format_store validates_presence_of :name, :field_format - validates_uniqueness_of :name, :scope => :type + validates_uniqueness_of :name, :scope => :type, :case_sensitive => true validates_length_of :name, :maximum => 30 validates_length_of :regexp, maximum: 255 validates_inclusion_of :field_format, diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb index 8e5191a63..f89aeaf0a 100644 --- a/app/models/enabled_module.rb +++ b/app/models/enabled_module.rb @@ -22,7 +22,7 @@ class EnabledModule < ActiveRecord::Base acts_as_watchable validates_presence_of :name - validates_uniqueness_of :name, :scope => :project_id + validates_uniqueness_of :name, :scope => :project_id, :case_sensitive => true after_create :module_enabled diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index e564aed05..83efea6df 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -32,7 +32,7 @@ class Enumeration < ActiveRecord::Base before_save :check_default validates_presence_of :name - validates_uniqueness_of :name, :scope => [:type, :project_id] + validates_uniqueness_of :name, :scope => [:type, :project_id], :case_sensitive => true validates_length_of :name, :maximum => 30 scope :shared, lambda {where(:project_id => nil)} diff --git a/app/models/issue_category.rb b/app/models/issue_category.rb index 1e1883392..21713d7fd 100644 --- a/app/models/issue_category.rb +++ b/app/models/issue_category.rb @@ -24,7 +24,7 @@ class IssueCategory < ActiveRecord::Base has_many :issues, :foreign_key => 'category_id', :dependent => :nullify validates_presence_of :name - validates_uniqueness_of :name, :scope => [:project_id] + validates_uniqueness_of :name, :scope => [:project_id], :case_sensitive => true validates_length_of :name, :maximum => 60 safe_attributes 'name', 'assigned_to_id' diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb index 09ee8b8cd..0f9e8bf91 100644 --- a/app/models/issue_relation.rb +++ b/app/models/issue_relation.rb @@ -72,7 +72,7 @@ class IssueRelation < ActiveRecord::Base validates_presence_of :issue_from, :issue_to, :relation_type validates_inclusion_of :relation_type, :in => TYPES.keys validates_numericality_of :delay, :allow_nil => true - validates_uniqueness_of :issue_to_id, :scope => :issue_from_id + validates_uniqueness_of :issue_to_id, :scope => :issue_from_id, :case_sensitive => true validate :validate_issue_relation before_save :handle_issue_order diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index f53c650a1..9176fcfa8 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -29,7 +29,7 @@ class IssueStatus < ActiveRecord::Base before_destroy :delete_workflow_rules validates_presence_of :name - validates_uniqueness_of :name + validates_uniqueness_of :name, :case_sensitive => true validates_length_of :name, :maximum => 30 validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true diff --git a/app/models/member.rb b/app/models/member.rb index 9c4044e15..f7b4038f5 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -25,7 +25,7 @@ class Member < ActiveRecord::Base belongs_to :project validates_presence_of :principal, :project - validates_uniqueness_of :user_id, :scope => :project_id + validates_uniqueness_of :user_id, :scope => :project_id, :case_sensitive => true validate :validate_role before_destroy :set_issue_category_nil, :remove_from_project_default_assigned_to diff --git a/app/models/project.rb b/app/models/project.rb index 4cab972aa..ab864436a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -72,7 +72,7 @@ class Project < ActiveRecord::Base :author => nil validates_presence_of :name, :identifier - validates_uniqueness_of :identifier, :if => proc {|p| p.identifier_changed?} + validates_uniqueness_of :identifier, :if => proc {|p| p.identifier_changed?}, :case_sensitive => true validates_length_of :name, :maximum => 255 validates_length_of :homepage, :maximum => 255 validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH diff --git a/app/models/repository.rb b/app/models/repository.rb index 1ff8d0abc..e65c800e6 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -43,7 +43,7 @@ class Repository < ActiveRecord::Base 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_uniqueness_of :identifier, :scope => :project_id, :case_sensitive => true 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/role.rb b/app/models/role.rb index 6b9a5f9d9..ee1a664e6 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -76,7 +76,7 @@ class Role < ActiveRecord::Base store :settings, :accessors => [:permissions_all_trackers, :permissions_tracker_ids] validates_presence_of :name - validates_uniqueness_of :name + validates_uniqueness_of :name, :case_sensitive => true validates_length_of :name, :maximum => 255 validates_inclusion_of( :issues_visibility, diff --git a/app/models/setting.rb b/app/models/setting.rb index 5e5685b37..e5c547665 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -85,6 +85,7 @@ class Setting < ActiveRecord::Base validates_uniqueness_of( :name, + :case_sensitive => true, :if => Proc.new do |setting| setting.new_record? || setting.name_changed? end diff --git a/app/models/token.rb b/app/models/token.rb index 5f91cfa95..5fcd01d7e 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -19,7 +19,7 @@ class Token < ActiveRecord::Base belongs_to :user - validates_uniqueness_of :value + validates_uniqueness_of :value, :case_sensitive => true before_create :delete_previous_tokens, :generate_new_token diff --git a/app/models/tracker.rb b/app/models/tracker.rb index f788ce566..ffa137a32 100644 --- a/app/models/tracker.rb +++ b/app/models/tracker.rb @@ -40,7 +40,7 @@ class Tracker < ActiveRecord::Base validates_presence_of :default_status validates_presence_of :name - validates_uniqueness_of :name + validates_uniqueness_of :name, :case_sensitive => true validates_length_of :name, :maximum => 30 validates_length_of :description, :maximum => 255 diff --git a/app/models/version.rb b/app/models/version.rb index 34fb55546..2e5430746 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -127,7 +127,7 @@ class Version < ActiveRecord::Base VERSION_SHARINGS = %w(none descendants hierarchy tree system) validates_presence_of :name - validates_uniqueness_of :name, :scope => [:project_id] + validates_uniqueness_of :name, :scope => [:project_id], :case_sensitive => true validates_length_of :name, :maximum => 60 validates_length_of :description, :wiki_page_title, :maximum => 255 validates :effective_date, :date => true diff --git a/app/models/watcher.rb b/app/models/watcher.rb index 2828fd0a0..90cefd281 100644 --- a/app/models/watcher.rb +++ b/app/models/watcher.rb @@ -22,7 +22,7 @@ class Watcher < ActiveRecord::Base belongs_to :user, :class_name => 'Principal' validates_presence_of :user - validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id] + validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id], :case_sensitive => true validate :validate_user # Returns true if at least one object among objects is watched by user -- 2.22.0