Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 11 deletions

diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb
index bb577b41fa8..21d3c6499a0 100644
--- a/app/services/groups/create_service.rb
+++ b/app/services/groups/create_service.rb
@@ -92,16 +92,6 @@ module Groups
         end
       end
 
-      if @group.organization && !can?(current_user, :create_group, @group.organization)
-        # We are unsetting this here to match behavior of invalid parent_id above and protect against possible
-        # committing to the database of a value that isn't allowed.
-        @group.organization = nil
-        message = s_("CreateGroup|You don't have permission to create a group in the provided organization.")
-        @group.errors.add(:organization_id, message)
-
-        return false
-      end
-
       true
     end
 
diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb
index 79557dae14a..9fc1a05476e 100644
--- a/app/services/groups/transfer_service.rb
+++ b/app/services/groups/transfer_service.rb
@@ -236,7 +236,7 @@ module Groups
 
     def ensure_ownership
       return if @new_parent_group
-      return unless @group.owners.empty?
+      return unless @group.all_owner_members.empty?
 
       add_owner_on_transferred_group
     end