diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-03 11:13:27 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-03 11:13:27 +0300 |
| commit | 6aad7b4941a2e35177b8e175c86bd3558e1a2b59 (patch) | |
| tree | ae6b80ecd2c2fb33c66fcad61cdc08672488d154 | |
| parent | 639cf5617f68270652163c85fd308300e3426114 (diff) | |
| parent | d14851f9a36ce4e41e94e21d251589a3d197c423 (diff) | |
Merge branch 'ce-jej/identity-relates-to-saml' into 'master'
[CE] Backport Identity.uniqueness_scope from EE
See merge request gitlab-org/gitlab-ce!18689
| -rw-r--r-- | app/models/identity.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/identity.rb b/app/models/identity.rb index 1011b9f1109..3fd0c5e751d 100644 --- a/app/models/identity.rb +++ b/app/models/identity.rb @@ -1,12 +1,16 @@ class Identity < ActiveRecord::Base + def self.uniqueness_scope + :provider + end + include Sortable include CaseSensitivity belongs_to :user validates :provider, presence: true - validates :extern_uid, allow_blank: true, uniqueness: { scope: :provider, case_sensitive: false } - validates :user_id, uniqueness: { scope: :provider } + validates :extern_uid, allow_blank: true, uniqueness: { scope: uniqueness_scope, case_sensitive: false } + validates :user_id, uniqueness: { scope: uniqueness_scope } before_save :ensure_normalized_extern_uid, if: :extern_uid_changed? after_destroy :clear_user_synced_attributes, if: :user_synced_attributes_metadata_from_provider? |