diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-10-05 12:48:22 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-10-05 12:48:22 +0200 |
| commit | 0c0c2ecd99cd5c4cb22a0c045f8d45d315203832 (patch) | |
| tree | 3900ccdcdff0cd6b8e3ed281ba57a317b801ad08 /spec/services/projects/fork_service_spec.rb | |
| parent | ed3c25e4294bfc75f7167ed63e30561e39ac3a97 (diff) | |
| parent | de01353b166018a43ea92b38054b1267c3ba5cea (diff) | |
| download | gitlab-ce-0c0c2ecd99cd5c4cb22a0c045f8d45d315203832.tar.gz | |
Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
# Conflicts:
# app/controllers/admin/users_controller.rb
# app/controllers/confirmations_controller.rb
# app/controllers/profiles/emails_controller.rb
# app/models/user.rb
# app/services/emails/base_service.rb
# app/services/emails/destroy_service.rb
# app/views/devise/mailer/confirmation_instructions.html.haml
# lib/api/users.rb
# spec/services/emails/destroy_service_spec.rb
Diffstat (limited to 'spec/services/projects/fork_service_spec.rb')
| -rw-r--r-- | spec/services/projects/fork_service_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb index a6e0364d44c..fa9d6969830 100644 --- a/spec/services/projects/fork_service_spec.rb +++ b/spec/services/projects/fork_service_spec.rb @@ -76,10 +76,11 @@ describe Projects::ForkService do end context 'repository already exists' 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'] } before do - gitlab_shell.add_repository(repository_storage_path, "#{@to_user.namespace.full_path}/#{@from_project.path}") + gitlab_shell.add_repository(repository_storage, "#{@to_user.namespace.full_path}/#{@from_project.path}") end after do |