home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7616 from yglukhov/fix-parallel-diff-on-new-mr

Browse Source 
Fixed parralel diff button on 'merge_requests/new' page
This commit is contained in:
Dmitriy Zaporozhets
2014-08-27 17:31:38 +03:00
parent c4a8663b57 f44a68a004
commit d4d723caee
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/commits/_diffs.html.haml
+5 -2
View File
@@ -4,9 +4,12 @@
.col-md-4
%ul.nav.nav-tabs
%li.pull-right{class: params[:view] == 'parallel' ? 'active' : ''}
= link_to "Side-by-side Diff", url_for(view: 'parallel'), {id: "commit-diff-viewtype"}
- params_copy = params.dup
- params_copy[:view] = 'parallel'
= link_to "Side-by-side Diff", url_for(params_copy), {id: "commit-diff-viewtype"}
%li.pull-right{class: params[:view] != 'parallel' ? 'active' : ''}
= link_to "Inline Diff", url_for(view: 'inline'), {id: "commit-diff-viewtype"}
- params_copy[:view] = 'inline'
= link_to "Inline Diff", url_for(params_copy), {id: "commit-diff-viewtype"}
- if show_diff_size_warninig?(diffs)
= render 'projects/commits/diff_warning', diffs: diffs