diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 15:07:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 15:07:55 +0000 |
| commit | f92a53a216e6e7d5037ac701efbee5628f91aa9a (patch) | |
| tree | 1eb957f0277b50002258681f61db869a2b683fec /spec/features/merge_request | |
| parent | e3764d340e2849fccee8c06278d1f5f686edd35b (diff) | |
| download | gitlab-ce-f92a53a216e6e7d5037ac701efbee5628f91aa9a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_suggests_changes_on_diff_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb index 859638f1a52..085fe38b47a 100644 --- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb +++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb @@ -97,7 +97,8 @@ describe 'User comments on a diff', :js do end context 'multiple suggestions in expanded lines' do - it 'suggestions are appliable' do + # https://gitlab.com/gitlab-org/gitlab/issues/38277 + it 'suggestions are appliable', :quarantine do diff_file = merge_request.diffs(paths: ['files/ruby/popen.rb']).diff_files.first hash = Digest::SHA1.hexdigest(diff_file.file_path) |