Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
0392dffd
Commit
0392dffd
authored
Apr 07, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update wording
parent
89df29e0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
doc/workflow/merge_requests.md
doc/workflow/merge_requests.md
+1
-1
spec/features/merge_requests/toggle_whitespace_changes.rb
spec/features/merge_requests/toggle_whitespace_changes.rb
+2
-2
No files found.
doc/workflow/merge_requests.md
View file @
0392dffd
...
@@ -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
)
If you click t
o "Hide whitespace changes" button, you can se
e diff without whitespace changes.
If you click t
he "Hide whitespace changes" button, you can see th
e 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
)
...
...
spec/features/merge_requests/toggle_whitespace_changes.rb
View file @
0392dffd
...
@@ -9,12 +9,12 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do
...
@@ -9,12 +9,12 @@ feature 'Toggle Whitespace Changes', js: true, feature: true do
visit
diffs_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
visit
diffs_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
end
it
'
should have
a button to toggle whitespace changes'
do
it
'
has
a button to toggle whitespace changes'
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
'
toggles the "Hide whitespace changes" button
'
do
click_link
"Hide whitespace changes"
click_link
"Hide whitespace changes"
expect
(
page
).
to
have_content
"Show whitespace changes"
expect
(
page
).
to
have_content
"Show whitespace changes"
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment