diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 16:28:54 +0000 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 16:28:54 +0000 |
| commit | e77c4e9efe0e19187929e5836cda5a3a59d0f89f (patch) | |
| tree | 91daaa89bb48457456f931c6b818f5e200390b56 /app/models/group.rb | |
| parent | 1e137c273ca6314d0ed6744910b95f179b1d538c (diff) | |
| parent | 9a8f5a2b605f85ace3c81a32cf1855f79cabde43 (diff) | |
| download | gitlab-ce-e77c4e9efe0e19187929e5836cda5a3a59d0f89f.tar.gz | |
Merge branch 'master' into 'issue_38337'
# Conflicts:
# app/models/group.rb
# db/schema.rb
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 32a0bd0c70b..8d183006c65 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -32,6 +32,7 @@ class Group < Namespace has_many :uploads, as: :model, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :boards + has_many :badges, class_name: 'GroupBadge' accepts_nested_attributes_for :variables, allow_destroy: true |