diff options
| author | Jeff Stubler <brunsa2@gmail.com> | 2015-12-03 21:53:06 -0600 |
|---|---|---|
| committer | Jeff Stubler <brunsa2@gmail.com> | 2015-12-03 21:53:06 -0600 |
| commit | 932a7fd96f5977db6119205daa85495ea161dd68 (patch) | |
| tree | 251f02d786fcec000bacfb3d19e063a636fc9635 /app/controllers/projects/commit_controller.rb | |
| parent | 64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (diff) | |
| parent | e9d06903dab75129a0df63e686e18e85bfaeee8d (diff) | |
| download | gitlab-ce-932a7fd96f5977db6119205daa85495ea161dd68.tar.gz | |
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index deefdd76667..3f137440e28 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -67,7 +67,12 @@ class Projects::CommitController < Projects::ApplicationController end def define_show_vars - @diffs = commit.diffs + if params[:w].to_i == 1 + @diffs = commit.diffs({ ignore_whitespace_change: true }) + else + @diffs = commit.diffs + end + @notes_count = commit.notes.count @builds = ci_commit.builds if ci_commit |