diff options
| author | DeAndre Harris <dharris@gitlab.com> | 2019-07-29 09:45:20 +0000 |
|---|---|---|
| committer | DeAndre Harris <dharris@gitlab.com> | 2019-07-29 09:45:20 +0000 |
| commit | 88b4b9bd2e8224e17ff089d2a8ea99f800686b70 (patch) | |
| tree | 67e6fadf31d75860f2158c05168f160d52ae46fe /spec/requests/api/projects_spec.rb | |
| parent | 750fd7374ae67bb6ed4d9d875052bbc6d86d9b31 (diff) | |
| parent | 77926ea02512d836c61a30e3986902e2d8e7f886 (diff) | |
| download | gitlab-ce-docs-troubleshoot-scim.tar.gz | |
Merge branch 'master' into 'docs-troubleshoot-scim'docs-troubleshoot-scim
# Conflicts:
# doc/user/group/saml_sso/scim_setup.md
Diffstat (limited to 'spec/requests/api/projects_spec.rb')
| -rw-r--r-- | spec/requests/api/projects_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index fee300e9d7a..5b3a2412aff 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -1357,7 +1357,7 @@ describe API::Projects do end end - context 'nested group project', :nested_groups do + context 'nested group project' do let(:group) { create(:group) } let(:nested_group) { create(:group, parent: group) } let(:project2) { create(:project, group: nested_group) } |