diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-15 14:25:08 +0000 |
commit | 35659da185e3c6ec2862884b4e9e19dd20445957 (patch) | |
tree | 4ce78341a0a0ea1c14249d41f70a060a5d39cc22 /features/steps/shared/note.rb | |
parent | 1405bf844831bbaf8a7ffb1c516906b858bfdbb6 (diff) | |
parent | fe09c25d68a61c5874e9beb0f018c05a4d789d70 (diff) | |
download | gitlab-ce-fix-btn-alignment.tar.gz |
Merge branch 'master' into 'fix-btn-alignment'fix-btn-alignment
# Conflicts:
# app/views/projects/merge_requests/_nav_btns.html.haml
Diffstat (limited to 'features/steps/shared/note.rb')
-rw-r--r-- | features/steps/shared/note.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb index 80187b83fee..492da38355c 100644 --- a/features/steps/shared/note.rb +++ b/features/steps/shared/note.rb @@ -11,8 +11,8 @@ module SharedNote note = find('.note') note.hover - note.find('.more-actions').click - note.find('.more-actions .dropdown-menu li', match: :first) + find('.more-actions').click + find('.more-actions .dropdown-menu li', match: :first) find(".js-note-delete").click end @@ -147,9 +147,6 @@ module SharedNote note = find('.note') note.hover - note.find('.more-actions').click - note.find('.more-actions .dropdown-menu li', match: :first) - note.find('.js-note-edit').click end |