diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-25 14:13:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-25 14:13:05 +0000 |
| commit | 429c0d14918d8727eac0e24ff01df5cdf55b2f79 (patch) | |
| tree | c281b17db6d232d257170f5f04e99de911ce5317 /app | |
| parent | 1c2ce6efde2de7ed1b969623856c6a18f6b8f385 (diff) | |
| parent | 3bee4a6712a654abeba4ce07eb17235c3240b487 (diff) | |
| download | gitlab-ce-429c0d14918d8727eac0e24ff01df5cdf55b2f79.tar.gz | |
Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master'
Fix "Reload with full diff" URL button in compare branch view
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
See merge request !1195
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/diffs/_warning.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml index caed0e69dc8..f99bc9a85eb 100644 --- a/app/views/projects/diffs/_warning.html.haml +++ b/app/views/projects/diffs/_warning.html.haml @@ -3,7 +3,7 @@ Too many changes to show. .pull-right - unless diff_hard_limit_enabled? - = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: :html)), class: "btn btn-sm btn-warning" + = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: nil)), class: "btn btn-sm btn-warning" - if current_controller?(:commit) or current_controller?(:merge_requests) - if current_controller?(:commit) |