diff options
| author | uran <uran@zeoalliance.com> | 2014-08-27 17:00:15 +0300 |
|---|---|---|
| committer | uran <uran@zeoalliance.com> | 2014-08-27 17:00:15 +0300 |
| commit | f44a68a0049663814205c277ff85ac96820e5f95 (patch) | |
| tree | 39e9b22ead83949e6b3e9c85b0ace7890f98bdca /app/views/projects/commits | |
| parent | 070e3964dcf5e61a97618913af75fdc878f71871 (diff) | |
| download | gitlab-ce-f44a68a0049663814205c277ff85ac96820e5f95.tar.gz | |
Fixed parralel diff button on 'merge_requests/new' page
Diffstat (limited to 'app/views/projects/commits')
| -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 |