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
Boxiang Sun
gitlab-ce
Commits
66a5d0fd
Commit
66a5d0fd
authored
Apr 04, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename method
parent
64c2d9bd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/helpers/diff_helper.rb
app/helpers/diff_helper.rb
+4
-4
No files found.
app/helpers/diff_helper.rb
View file @
66a5d0fd
...
@@ -23,7 +23,7 @@ module DiffHelper
...
@@ -23,7 +23,7 @@ module DiffHelper
end
end
def
diff_options
def
diff_options
options
=
{
ignore_whitespace_change:
hide_whitespace
s
?
}
options
=
{
ignore_whitespace_change:
hide_whitespace?
}
if
diff_hard_limit_enabled?
if
diff_hard_limit_enabled?
options
.
merge!
(
Commit
.
max_diff_options
)
options
.
merge!
(
Commit
.
max_diff_options
)
end
end
...
@@ -129,16 +129,16 @@ module DiffHelper
...
@@ -129,16 +129,16 @@ module DiffHelper
end
end
end
end
def
hide_whitespace
s
?
def
hide_whitespace?
params
[
:w
]
==
'1'
params
[
:w
]
==
'1'
end
end
def
params_with_whitespace
def
params_with_whitespace
hide_whitespace
s
?
?
request
.
query_parameters
.
except
(
:w
)
:
request
.
query_parameters
.
merge
(
w:
1
)
hide_whitespace?
?
request
.
query_parameters
.
except
(
:w
)
:
request
.
query_parameters
.
merge
(
w:
1
)
end
end
def
toggle_whitespace_link
(
url
)
def
toggle_whitespace_link
(
url
)
link_to
"
#{
hide_whitespace
s
?
?
'Show'
:
'Hide'
}
whitespace changes"
,
url
,
class:
"btn btn-default"
link_to
"
#{
hide_whitespace?
?
'Show'
:
'Hide'
}
whitespace changes"
,
url
,
class:
"btn btn-default"
end
end
def
commit_diff_whitespace_link
(
project
,
commit
)
def
commit_diff_whitespace_link
(
project
,
commit
)
...
...
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