diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-11-01 18:40:39 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-11-01 18:41:11 +0300 |
| commit | 160b84f8b5bce3a80e6b6b4de3f48e8c0ef9ae0c (patch) | |
| tree | e88a029b95b82905d9192fe9c86189cc64a82533 /spec | |
| parent | ed5c532490d27e3c35decede29627af1d3373c3c (diff) | |
Try to fix conflict resolution
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/services/projects/update_service_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index 3af9f63b434..7fb4978f02b 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -149,7 +149,8 @@ describe Projects::UpdateService, '#execute' do end context 'when renaming a project' do - let(:repository_storage_path) { Gitlab.config.repositories.storages['default']['path'] } + let(:repository_storage) { 'default' } + let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] } context 'with legacy storage' do before do |