diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-27 17:31:38 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-27 17:31:38 +0300 |
| commit | d4d723caeed66ea215561689947b35dc8bde7404 (patch) | |
| tree | aea7b8b60956940960a1f233ec4d63f6f569757b | |
| parent | c4a8663b573d683ebd5c8decd7c419c87c6ddb83 (diff) | |
| parent | f44a68a0049663814205c277ff85ac96820e5f95 (diff) | |
| download | gitlab-ce-d4d723caeed66ea215561689947b35dc8bde7404.tar.gz | |
Merge pull request #7616 from yglukhov/fix-parallel-diff-on-new-mr
Fixed parralel diff button on 'merge_requests/new' page
| -rw-r--r-- | app/views/projects/commits/_diffs.html.haml | 7 |
1 files 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 |