diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/models/customer_relations/organization.rb | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/models/customer_relations/organization.rb')
-rw-r--r-- | app/models/customer_relations/organization.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/models/customer_relations/organization.rb b/app/models/customer_relations/organization.rb index caf1cd68cc5..a18d3ab8148 100644 --- a/app/models/customer_relations/organization.rb +++ b/app/models/customer_relations/organization.rb @@ -1,11 +1,13 @@ # frozen_string_literal: true class CustomerRelations::Organization < ApplicationRecord + include StripAttribute + self.table_name = "customer_relations_organizations" belongs_to :group, -> { where(type: 'Group') }, foreign_key: 'group_id' - before_validation :strip_whitespace! + strip_attributes! :name enum state: { inactive: 0, @@ -22,10 +24,4 @@ class CustomerRelations::Organization < ApplicationRecord where(group: group_id) .where('LOWER(name) = LOWER(?)', name) end - - private - - def strip_whitespace! - name&.strip! - end end |