diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-25 15:00:35 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-25 15:00:35 +0000 |
| commit | f92a80b42ad7e4ea267d90a2555ef9c982ad1f81 (patch) | |
| tree | f6d8b88d97fa8553b7bd418d47c24b07e1d89cd5 /app | |
| parent | 4fb4915632f79f6134e95139f39a94ff78542de9 (diff) | |
| parent | 529a07bd1e05a85b3cfa117ed8980ad64d997db0 (diff) | |
| download | gitlab-ce-f92a80b42ad7e4ea267d90a2555ef9c982ad1f81.tar.gz | |
Merge branch 'bvl-fix-mysql-bare-repository-importer' into 'master'
Handle creating a nested group on MySQL correctly
See merge request !13829
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/groups/nested_create_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/groups/nested_create_service.rb b/app/services/groups/nested_create_service.rb index 8d793f5c02e..d6f08fc3cce 100644 --- a/app/services/groups/nested_create_service.rb +++ b/app/services/groups/nested_create_service.rb @@ -15,6 +15,10 @@ module Groups return group end + if group_path.include?('/') && !Group.supports_nested_groups? + raise 'Nested groups are not supported on MySQL' + end + create_group_path end |