diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-18 03:09:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-18 03:09:21 +0000 |
| commit | cfaf98a3b214c773f058ed9648314e4f147bbba4 (patch) | |
| tree | c02a6855511a65696890c21270da5911896beff2 /spec/controllers | |
| parent | c48065a833f9ead3357c48ea077165c15e8d585c (diff) | |
| download | gitlab-ce-cfaf98a3b214c773f058ed9648314e4f147bbba4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index d7d1278159b..f159f0e6099 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -95,7 +95,8 @@ RSpec.describe Projects::MergeRequestsController do project, merge_request, 'json', - diff_head: true)) + diff_head: true, + view: 'inline')) end end |