diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 09:06:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 09:06:03 +0000 |
| commit | b3e4ec8e8adf4fe96c982124e91b6a05021a9cda (patch) | |
| tree | 5fda0011a7cc7de000186e465e61f893d478a1c8 /spec/views/projects/merge_requests/_commits.html.haml_spec.rb | |
| parent | 90cdc9391171e1be29b2b57a2e2aad0c02c2a7a9 (diff) | |
| download | gitlab-ce-b3e4ec8e8adf4fe96c982124e91b6a05021a9cda.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views/projects/merge_requests/_commits.html.haml_spec.rb')
| -rw-r--r-- | spec/views/projects/merge_requests/_commits.html.haml_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb index 71d74b06f85..755a40a7e4c 100644 --- a/spec/views/projects/merge_requests/_commits.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/_commits.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'projects/merge_requests/_commits.html.haml' do +describe 'projects/merge_requests/_commits.html.haml', :sidekiq_might_not_need_inline do include Devise::Test::ControllerHelpers include ProjectForksHelper |