diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-03-26 22:56:37 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-03-26 22:56:37 +0300 |
commit | 21ae60c6a841c3530571fecb330034912043d021 (patch) | |
tree | 172a1a5f395883fd607ecda0b9866a40272cf9e6 /spec/services/projects/create_service_spec.rb | |
parent | 3401227dd3a8b5adb1bf23d3b99d25d2ad1011b5 (diff) | |
parent | 7c02d0cff3d79d9159b2966ce4807b71c4eff358 (diff) | |
download | gitlab-ce-21ae60c6a841c3530571fecb330034912043d021.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into _mr-refector-review-target_mr-refector-review-target
# Conflicts:
# app/assets/javascripts/notes.js
Diffstat (limited to 'spec/services/projects/create_service_spec.rb')
-rw-r--r-- | spec/services/projects/create_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb index 8471467d2fa..4413c6ef83e 100644 --- a/spec/services/projects/create_service_spec.rb +++ b/spec/services/projects/create_service_spec.rb @@ -153,7 +153,7 @@ describe Projects::CreateService, '#execute' do context 'when another repository already exists on disk' do let(:repository_storage) { 'default' } - let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] } + let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage].legacy_disk_path } let(:opts) do { |