From 160b84f8b5bce3a80e6b6b4de3f48e8c0ef9ae0c Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova Date: Wed, 1 Nov 2017 16:40:39 +0100 Subject: Try to fix conflict resolution --- config/routes.rb | 13 ------------- spec/services/projects/update_service_spec.rb | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 8406372f03f..06e9a13ee46 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,19 +87,6 @@ Rails.application.routes.draw do # Notification settings resources :notification_settings, only: [:create, :update] - # Boards resources shared between group and projects - resources :boards do - resources :lists, module: :boards, only: [:index, :create, :update, :destroy] do - collection do - post :generate - end - - resources :issues, only: [:index, :create, :update] - end - - resources :issues, module: :boards, only: [:index, :update] - end - draw :import draw :uploads draw :explore 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 -- cgit v1.2.3