Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-08-28 12:57:02 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2017-08-28 12:57:02 +0300
commit922eb6d331ba26a8e89a390f528a845dbf195e44 (patch)
tree821357813a7ba614f5d7ecba5ceae2b1691ce163
parentef8eb3f6f7c1af167017ecc854e9fe385cee9354 (diff)
parentbd1be9bb43fa08f79843fb786b61487a256f7c2c (diff)
Merge branch 'jej/remove-dependent-destroy-from-protected-refs' into 'master'
Remove 'dependent: :destroy' from ProtectedRef has_many :"#{type}_access_levels" See merge request !13835
-rw-r--r--app/models/concerns/protected_ref.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/protected_ref.rb b/app/models/concerns/protected_ref.rb
index ef95d6b0f98..454374121f3 100644
--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -23,7 +23,7 @@ module ProtectedRef
# If we don't `protected_branch` or `protected_tag` would be empty and
# `project` cannot be delegated to it, which in turn would cause validations
# to fail.
- has_many :"#{type}_access_levels", dependent: :destroy, inverse_of: self.model_name.singular # rubocop:disable Cop/ActiveRecordDependent
+ has_many :"#{type}_access_levels", inverse_of: self.model_name.singular # rubocop:disable Cop/ActiveRecordDependent
validates :"#{type}_access_levels", length: { is: 1, message: "are restricted to a single instance per #{self.model_name.human}." }