diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 12:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-07 12:09:13 +0000 |
| commit | 211a8c3361ccf4eb92f36edbdcf15c98fcdcc8b7 (patch) | |
| tree | 0ad37172721a39b0d57240bb1b4e70f200a0d93e /spec/requests/api/merge_requests_spec.rb | |
| parent | 456a7247f9e88fc2518b69a1a00e905c6db6d775 (diff) | |
| download | gitlab-ce-211a8c3361ccf4eb92f36edbdcf15c98fcdcc8b7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api/merge_requests_spec.rb')
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 245a8aa4905..427a361295c 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -1492,7 +1492,7 @@ describe API::MergeRequests do end end - context 'forked projects' do + context 'forked projects', :sidekiq_might_not_need_inline do let!(:user2) { create(:user) } let(:project) { create(:project, :public, :repository) } let!(:forked_project) { fork_project(project, user2, repository: true) } |