Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 1 deletions

diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 1753b2a0220..050db3b6870 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -104,6 +104,10 @@ class ProtectedBranch < ApplicationRecord
     name == project.default_branch
   end
 
+  def entity
+    group || project
+  end
+
   private
 
   def validate_either_project_or_top_group
@@ -111,7 +115,7 @@ class ProtectedBranch < ApplicationRecord
       errors.add(:base, _('must be associated with a Group or a Project'))
     elsif project && group
       errors.add(:base, _('cannot be associated with both a Group and a Project'))
-    elsif group && group.root_ancestor != group
+    elsif group && group.subgroup?
       errors.add(:base, _('cannot be associated with a subgroup'))
     end
   end