diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-03-25 23:39:34 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-03-25 23:39:34 -0700 |
| commit | 546dab6da9b157efcd2e45c38b94eb118919fa4f (patch) | |
| tree | 13451c05cd9a492aad7b82d273f15bdc303d1763 /app/helpers/diff_helper.rb | |
| parent | 12430b65d44f93bb77979d7bb546814c637fd5c6 (diff) | |
| download | gitlab-ce-546dab6da9b157efcd2e45c38b94eb118919fa4f.tar.gz | |
Fix broken side-by-side diff view on merge request page
Closes #1294
Diffstat (limited to 'app/helpers/diff_helper.rb')
| -rw-r--r-- | app/helpers/diff_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index f81504991d3..b56f21c7a18 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -121,6 +121,8 @@ module DiffHelper def inline_diff_btn params_copy = params.dup params_copy[:view] = 'inline' + # Always use HTML to handle case where JSON diff rendered this button + params_copy.delete(:format) link_to url_for(params_copy), id: "commit-diff-viewtype", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do 'Inline' @@ -130,6 +132,8 @@ module DiffHelper def parallel_diff_btn params_copy = params.dup params_copy[:view] = 'parallel' + # Always use HTML to handle case where JSON diff rendered this button + params_copy.delete(:format) link_to url_for(params_copy), id: "commit-diff-viewtype", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do 'Side-by-side' |