Commit 1cf13817 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Add tooltip for comment toggle in diff. Add changelog item and fix tests

parent e07d32eb
...@@ -6,6 +6,7 @@ v 7.10.0 (unreleased) ...@@ -6,6 +6,7 @@ v 7.10.0 (unreleased)
- Add a service to support external wikis (Hannes Rosenögger) - Add a service to support external wikis (Hannes Rosenögger)
- List new commits for newly pushed branch in activity view. - List new commits for newly pushed branch in activity view.
- Add changelog, license and contribution guide links to project sidebar. - Add changelog, license and contribution guide links to project sidebar.
- Improve diff UI
v 7.9.0 (unreleased) v 7.9.0 (unreleased)
- Add HipChat integration documentation (Stan Hu) - Add HipChat integration documentation (Stan Hu)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.diff-btn-group .diff-btn-group
- if blob.text? - if blob.text?
= link_to '#', class: 'js-toggle-diff-comments btn btn-sm active' do = link_to '#', class: 'js-toggle-diff-comments btn btn-sm active has_tooltip', title: "Toggle comments for this file" do
%i.fa.fa-comments %i.fa.fa-comments
   
......
...@@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps ...@@ -209,13 +209,13 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I click link "Hide inline discussion" of the second file' do step 'I click link "Hide inline discussion" of the second file' do
within '.files [id^=diff]:nth-child(2)' do within '.files [id^=diff]:nth-child(2)' do
click_link 'Show/Hide comments' find('.js-toggle-diff-comments').click
end end
end end
step 'I click link "Show inline discussion" of the second file' do step 'I click link "Show inline discussion" of the second file' do
within '.files [id^=diff]:nth-child(2)' do within '.files [id^=diff]:nth-child(2)' do
click_link 'Show/Hide comments' find('.js-toggle-diff-comments').click
end end
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment