Merge branch 'master' into 'dz-remove-namespaces-path-uniq'

Merge Request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8013

# Conflicts:
#   db/schema.rb

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 40f1cf92e00..893c6827a91 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -270,4 +270,11 @@ describe Group, models: true do
       expect(group.web_url).to include("groups/#{group.name}")
     end
   end
+
+  describe 'nested group' do
+    subject { create(:group, :nested) }
+
+    it { is_expected.to be_valid }
+    it { expect(subject.parent).to be_kind_of(Group) }
+  end
 end