diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 12:07:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 12:07:35 +0000 |
| commit | e3764d340e2849fccee8c06278d1f5f686edd35b (patch) | |
| tree | 23de7fe0eaa58a82c3a72eb8ff4a195e24627eb7 /spec/features/merge_request | |
| parent | e3d67bcff7b8bc6a453d0814d404a9a61d97bc0f (diff) | |
| download | gitlab-ce-e3764d340e2849fccee8c06278d1f5f686edd35b.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 | 4 |
1 files changed, 1 insertions, 3 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 7fe72e1bc8a..859638f1a52 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,9 +97,7 @@ describe 'User comments on a diff', :js do end context 'multiple suggestions in expanded lines' do - # Report issue: https://gitlab.com/gitlab-org/gitlab/issues/38277 - # Fix issue: https://gitlab.com/gitlab-org/gitlab/issues/39095 - it 'suggestions are appliable', :quarantine do + it 'suggestions are appliable' do diff_file = merge_request.diffs(paths: ['files/ruby/popen.rb']).diff_files.first hash = Digest::SHA1.hexdigest(diff_file.file_path) |