From f44a68a0049663814205c277ff85ac96820e5f95 Mon Sep 17 00:00:00 2001 From: uran Date: Wed, 27 Aug 2014 17:00:15 +0300 Subject: Fixed parralel diff button on 'merge_requests/new' page --- app/views/projects/commits/_diffs.html.haml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/projects/commits/_diffs.html.haml b/app/views/projects/commits/_diffs.html.haml index 64d6a2f09cf..17efa8debe1 100644 --- a/app/views/projects/commits/_diffs.html.haml +++ b/app/views/projects/commits/_diffs.html.haml @@ -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 -- cgit v1.2.1