diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-17 14:33:35 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-17 14:33:35 +0100 |
| commit | 7b014338ca94caf4677a035f28469945e6a80100 (patch) | |
| tree | c442bdae95edb35d14551ca04052227bdb840511 /app/helpers/diff_helper.rb | |
| parent | bb8b6f38e7fef0afd41088d54d9dda41695ec1c7 (diff) | |
| parent | 1c040b3f0a3ecb18fc8fdea3cf99b70edad8d873 (diff) | |
| download | gitlab-ce-contributor-graph-by-email.tar.gz | |
Merge branch 'master' into contributor-graph-by-emailcontributor-graph-by-email
Diffstat (limited to 'app/helpers/diff_helper.rb')
| -rw-r--r-- | app/helpers/diff_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index e65e37211c4..b889fb28973 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -137,7 +137,7 @@ module DiffHelper # Always use HTML to handle case where JSON diff rendered this button params_copy.delete(:format) - link_to url_for(params_copy), id: "inline-diff-btn", class: (params[:view] != 'parallel' ? 'btn btn-sm active' : 'btn btn-sm') do + link_to url_for(params_copy), id: "inline-diff-btn", class: (params[:view] != 'parallel' ? 'btn active' : 'btn') do 'Inline' end end @@ -148,7 +148,7 @@ module DiffHelper # Always use HTML to handle case where JSON diff rendered this button params_copy.delete(:format) - link_to url_for(params_copy), id: "parallel-diff-btn", class: (params[:view] == 'parallel' ? 'btn active btn-sm' : 'btn btn-sm') do + link_to url_for(params_copy), id: "parallel-diff-btn", class: (params[:view] == 'parallel' ? 'btn active' : 'btn') do 'Side-by-side' end end |