diff options
author | James Lopez <james@gitlab.com> | 2019-03-27 07:37:06 +0000 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2019-03-27 07:37:06 +0000 |
commit | 82da4b1fd43aba9f63e007ad742690ffd868f6c7 (patch) | |
tree | c9c96c0f85869ada80b02e0e7478741553ea5fbd /spec/requests | |
parent | a41624b910f6581652b546bc868abc64f5f722f4 (diff) | |
parent | d36415b7545fff543f08a5175790e3a92f383475 (diff) | |
download | gitlab-ce-82da4b1fd43aba9f63e007ad742690ffd868f6c7.tar.gz |
Merge branch 'bvl-allow-more-repos-per-resource-ce' into 'master'
Allow multiple repositories per project
See merge request gitlab-org/gitlab-ce!26539
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/internal_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index b184c92824a..537194b8e11 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -321,7 +321,7 @@ describe API::Internal do end context 'with env passed as a JSON' do - let(:gl_repository) { project.gl_repository(is_wiki: true) } + let(:gl_repository) { Gitlab::GlRepository::WIKI.identifier_for_subject(project) } it 'sets env in RequestStore' do obj_dir_relative = './objects' @@ -975,9 +975,9 @@ describe API::Internal do def gl_repository_for(project_or_wiki) case project_or_wiki when ProjectWiki - project_or_wiki.project.gl_repository(is_wiki: true) + Gitlab::GlRepository::WIKI.identifier_for_subject(project_or_wiki.project) when Project - project_or_wiki.gl_repository(is_wiki: false) + Gitlab::GlRepository::PROJECT.identifier_for_subject(project_or_wiki) else nil end |