diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 03:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 03:09:08 +0300 |
| commit | f54a50aa826d0eedcf2e56f51462613bc132f826 (patch) | |
| tree | 7194aca23f9af822ea55966a6f477b3d8d68ee47 /spec/features/merge_request | |
| parent | c77fda905a8619b756163c10a75171dc9cfe7084 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb b/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb index 26984a1fb5e..a38bc4f702b 100644 --- a/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb +++ b/spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb @@ -20,7 +20,7 @@ describe 'User views merged merge request from deleted fork' do fork_owner = source_project.namespace.owners.first # Place the source_project in the weird in between state source_project.update_attribute(:pending_delete, true) - Projects::DestroyService.new(source_project, fork_owner, {}).__send__(:trash_repositories!) + Projects::DestroyService.new(source_project, fork_owner, {}).__send__(:trash_project_repositories!) end it 'correctly shows the merge request' do |