diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-24 15:08:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-24 15:08:05 +0000 |
| commit | 2a6227a9fca46ca5c982f1cb75754fb1c722b360 (patch) | |
| tree | e1f1c3386336fdd24f6445134989161b3681c17b /spec/models | |
| parent | 03bd3081cafe249d9e8c73999411ce9999466c37 (diff) | |
| parent | b0498c176fa134761d899c9b369be12f1ca789c5 (diff) | |
| download | gitlab-ce-2a6227a9fca46ca5c982f1cb75754fb1c722b360.tar.gz | |
Merge branch 'dm-fix-routes' into 'master'
Fix ambiguous routing issues by teaching router about reserved words
See merge request !11570
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/namespace_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb index 8624616316c..312302afdbb 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -37,7 +37,7 @@ describe Namespace, models: true do it 'rejects nested paths' do parent = create(:group, :nested, path: 'environments') - namespace = build(:project, path: 'folders', namespace: parent) + namespace = build(:group, path: 'folders', parent: parent) expect(namespace).not_to be_valid end |