diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-11 03:08:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-11 03:08:58 +0300 |
| commit | 5427433c6d79f9131f4025cabb7e3208380bce9a (patch) | |
| tree | ea0a22450f467f1ef1e3449255017dbe0f178882 /app/models/operations | |
| parent | 13bcb8221306526671a61df589f7c05505c9934c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/operations')
| -rw-r--r-- | app/models/operations/feature_flag.rb | 2 | ||||
| -rw-r--r-- | app/models/operations/feature_flags/user_list.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/operations/feature_flag.rb b/app/models/operations/feature_flag.rb index c9e52fe51f2..442f9d36c43 100644 --- a/app/models/operations/feature_flag.rb +++ b/app/models/operations/feature_flag.rb @@ -13,7 +13,7 @@ module Operations belongs_to :project - has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.operations_feature_flags&.maximum(:iid) } + has_internal_id :iid, scope: :project default_value_for :active, true diff --git a/app/models/operations/feature_flags/user_list.rb b/app/models/operations/feature_flags/user_list.rb index 782f7a54058..3e492eaa892 100644 --- a/app/models/operations/feature_flags/user_list.rb +++ b/app/models/operations/feature_flags/user_list.rb @@ -13,7 +13,7 @@ module Operations has_many :strategy_user_lists has_many :strategies, through: :strategy_user_lists - has_internal_id :iid, scope: :project, init: ->(s) { s&.project&.operations_feature_flags_user_lists&.maximum(:iid) }, presence: true + has_internal_id :iid, scope: :project, presence: true validates :project, presence: true validates :name, |