Commit 5d5df26a authored by Alfredo Sumaran's avatar Alfredo Sumaran

Add documentation for "Hide whitespace changes" button

parent a1a9a1cf
...@@ -12,9 +12,9 @@ Locate the section for your GitLab remote in the `.git/config` file. It looks li ...@@ -12,9 +12,9 @@ Locate the section for your GitLab remote in the `.git/config` file. It looks li
fetch = +refs/heads/*:refs/remotes/origin/* fetch = +refs/heads/*:refs/remotes/origin/*
``` ```
Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section. Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section.
It should looks like this: It should look like this:
``` ```
[remote "origin"] [remote "origin"]
...@@ -43,7 +43,7 @@ $ git checkout origin/merge-requests/1 ...@@ -43,7 +43,7 @@ $ git checkout origin/merge-requests/1
![MR diff](merge_requests/merge_request_diff.png) ![MR diff](merge_requests/merge_request_diff.png)
It you add `w=1` option to URL, you can see diff without whitespace changes. If you click to "Hide whitespace changes" button, you can see diff without whitespace changes.
![MR diff without whitespace](merge_requests/merge_request_diff_without_whitespace.png) ![MR diff without whitespace](merge_requests/merge_request_diff_without_whitespace.png)
......
...@@ -13,7 +13,7 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do ...@@ -13,7 +13,7 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do
expect(page).to have_content "Hide whitespace changes" expect(page).to have_content "Hide whitespace changes"
end end
describe 'clicking hide whitespace changes button' do describe 'clicking "Hide whitespace changes" button' do
it 'should hide whitespace changes' do it 'should hide whitespace changes' do
find('a', text: "Hide whitespace changes").click find('a', text: "Hide whitespace changes").click
expect(page).to have_content "Show whitespace changes" expect(page).to have_content "Show whitespace changes"
......
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