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
8c4a3c77
Commit
8c4a3c77
authored
Nov 30, 2015
by
Minsik Yoon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ignore whitespace change option to commit view
parent
d73d2a5e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
1 deletion
+22
-1
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+6
-1
spec/controllers/commit_controller_spec.rb
spec/controllers/commit_controller_spec.rb
+15
-0
No files found.
CHANGELOG
View file @
8c4a3c77
...
@@ -7,6 +7,7 @@ v 8.3.0 (unreleased)
...
@@ -7,6 +7,7 @@ v 8.3.0 (unreleased)
- Fix 500 error when update group member permission
- Fix 500 error when update group member permission
- Fix: Raw private snippets access workflow
- Fix: Raw private snippets access workflow
- Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera)
- Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera)
- Add ignore whitespace change option to commit view
v 8.2.1
v 8.2.1
- Forcefully update builds that didn't want to update with state machine
- Forcefully update builds that didn't want to update with state machine
...
...
app/controllers/projects/commit_controller.rb
View file @
8c4a3c77
...
@@ -67,7 +67,12 @@ class Projects::CommitController < Projects::ApplicationController
...
@@ -67,7 +67,12 @@ class Projects::CommitController < Projects::ApplicationController
end
end
def
define_show_vars
def
define_show_vars
if
params
[
:w
].
to_i
==
1
@diffs
=
commit
.
diffs
({
ignore_whitespace_change:
true
})
else
@diffs
=
commit
.
diffs
@diffs
=
commit
.
diffs
end
@notes_count
=
commit
.
notes
.
count
@notes_count
=
commit
.
notes
.
count
@builds
=
ci_commit
.
builds
if
ci_commit
@builds
=
ci_commit
.
builds
if
ci_commit
...
...
spec/controllers/commit_controller_spec.rb
View file @
8c4a3c77
...
@@ -69,6 +69,21 @@ describe Projects::CommitController do
...
@@ -69,6 +69,21 @@ describe Projects::CommitController do
expect
(
response
.
body
).
to
start_with
(
"diff --git"
)
expect
(
response
.
body
).
to
start_with
(
"diff --git"
)
end
end
it
"should really only be a git diff without whitespace changes"
do
get
(
:show
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
id:
'66eceea0db202bb39c4e445e8ca28689645366c5'
,
# id: commit.id,
format:
format
,
w:
1
)
expect
(
response
.
body
).
to
start_with
(
"diff --git"
)
# without whitespace option, there are more than 2 diff_splits
diff_splits
=
assigns
(
:diffs
)[
0
].
diff
.
split
(
"
\n
"
)
expect
(
diff_splits
.
length
).
to
be
<=
2
end
end
end
describe
"as patch"
do
describe
"as patch"
do
...
...
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