diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-06 00:09:49 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-26 22:01:40 +0300 |
| commit | 5d5df26ab1b65b094eaa2ca2ca6db49b6d8530ea (patch) | |
| tree | 6de08f70742d444a1f823feb7738f5170cf01468 | |
| parent | a1a9a1cf8d26fc85598eb982a78720282055a96f (diff) | |
Add documentation for "Hide whitespace changes" button
| -rw-r--r-- | doc/workflow/merge_requests.md | 6 | ||||
| -rw-r--r-- | doc/workflow/merge_requests/commit_compare.png | bin | 89631 -> 110376 bytes | |||
| -rw-r--r-- | doc/workflow/merge_requests/merge_request_diff.png | bin | 120422 -> 166226 bytes | |||
| -rw-r--r-- | doc/workflow/merge_requests/merge_request_diff_without_whitespace.png | bin | 98887 -> 121476 bytes | |||
| -rw-r--r-- | spec/features/merge_requests/toggle_whitespace_changes.rb | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md index 6d57b5d98cd..3a47838e977 100644 --- a/doc/workflow/merge_requests.md +++ b/doc/workflow/merge_requests.md @@ -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/* ``` -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"] @@ -43,7 +43,7 @@ $ git checkout origin/merge-requests/1  -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.  diff --git a/doc/workflow/merge_requests/commit_compare.png b/doc/workflow/merge_requests/commit_compare.png Binary files differindex 46b3a56a59b..dfd7ee220f0 100644 --- a/doc/workflow/merge_requests/commit_compare.png +++ b/doc/workflow/merge_requests/commit_compare.png diff --git a/doc/workflow/merge_requests/merge_request_diff.png b/doc/workflow/merge_requests/merge_request_diff.png Binary files differindex ed08ae91bec..f368423c746 100644 --- a/doc/workflow/merge_requests/merge_request_diff.png +++ b/doc/workflow/merge_requests/merge_request_diff.png diff --git a/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png b/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png Binary files differindex 67d67a64d12..b2d03bb66f9 100644 --- a/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png +++ b/doc/workflow/merge_requests/merge_request_diff_without_whitespace.png diff --git a/spec/features/merge_requests/toggle_whitespace_changes.rb b/spec/features/merge_requests/toggle_whitespace_changes.rb index 85b8d6975fc..1d7981d9fb5 100644 --- a/spec/features/merge_requests/toggle_whitespace_changes.rb +++ b/spec/features/merge_requests/toggle_whitespace_changes.rb @@ -13,7 +13,7 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do expect(page).to have_content "Hide whitespace changes" end - describe 'clicking hide whitespace changes button' do + describe 'clicking "Hide whitespace changes" button' do it 'should hide whitespace changes' do find('a', text: "Hide whitespace changes").click expect(page).to have_content "Show whitespace changes" |
