diff options
| author | Phil Hughes <me@iamphill.com> | 2017-10-03 09:44:38 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-03 09:44:38 +0000 |
| commit | 7dbdc9837ccbfeeb3f980becc0dfede06149331e (patch) | |
| tree | eb4daf2a5e3aa1f3f7cb95888dd2d131bbb07e73 /features | |
| parent | b8e47d72637167be5a225fe20b5f893c43b9a885 (diff) | |
| parent | b74c643c66fd15c95ad148231ebcf4f85283ca16 (diff) | |
| download | gitlab-ce-7dbdc9837ccbfeeb3f980becc0dfede06149331e.tar.gz | |
Merge branch 'dm-copy-parallel-diff' into 'master'
Only copy old/new code when selecting left/right side of parallel diff
See merge request gitlab-org/gitlab-ce!14561
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/shared/diff_note.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb index 2c59ec5bb06..c872bd6f861 100644 --- a/features/steps/shared/diff_note.rb +++ b/features/steps/shared/diff_note.rb @@ -232,7 +232,7 @@ module SharedDiffNote end def click_parallel_diff_line(code, line_type) - find(".line_holder.parallel .diff-line-num[id='#{code}']").trigger 'mouseover' + find(".line_holder.parallel td[id='#{code}']").find(:xpath, 'preceding-sibling::*[1][self::td]').trigger 'mouseover' find(".line_holder.parallel button[data-line-code='#{code}']").trigger 'click' end end |