diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-02 13:43:33 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-02 17:24:08 -0600 |
| commit | 436ea57f56ace872f670562501ab01216f7d41a6 (patch) | |
| tree | 7b26763650c28094b3a46dfdd81f09b57e9690ce /spec/features/merge_requests/conflicts_spec.rb | |
| parent | 3ebb815a38ba86e4133557f77b94c292c8fc2e7e (diff) | |
| download | gitlab-ce-436ea57f56ace872f670562501ab01216f7d41a6.tar.gz | |
Reduce base font sizes across appreduce-font-size
Diffstat (limited to 'spec/features/merge_requests/conflicts_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index d258ff52bbb..5bc4ab2dfe5 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -20,7 +20,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do all('button', text: 'Use ours').each do |button| - button.click + button.trigger('click') end end |