diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-06-30 16:17:10 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-07-08 10:57:21 +0100 |
| commit | 78496e8c38ce0b415fa7aad5310b937a95265627 (patch) | |
| tree | 6f6e31d2e1bd52918833bcf12e255a939d941f3a /app/views/projects | |
| parent | b6b26692ea44cfeab7e8fd64b7df60852850fce2 (diff) | |
| download | gitlab-ce-78496e8c38ce0b415fa7aad5310b937a95265627.tar.gz | |
Disable overflow messages
With the option to expand and collapse individual diffs, these aren't
needed any more.
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/diffs/_text_file.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/diffs/_warning.html.haml | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml index 192093d1273..d61292c4bcb 100644 --- a/app/views/projects/diffs/_text_file.html.haml +++ b/app/views/projects/diffs/_text_file.html.haml @@ -1,9 +1,4 @@ -- too_big = diff_file.diff_lines.count > Commit::DIFF_SAFE_LINES -- if too_big - .suppressed-container - %a.show-suppressed-diff.js-show-suppressed-diff Changes suppressed. Click to show. - -%table.text-file.code.js-syntax-highlight{ class: too_big ? 'hide' : '' } +%table.text-file.code.js-syntax-highlight - last_line = 0 - diff_file.highlighted_diff_lines.each do |line| - last_line = line.new_pos diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml index 15536c17f8e..10fa1ddf2e5 100644 --- a/app/views/projects/diffs/_warning.html.haml +++ b/app/views/projects/diffs/_warning.html.haml @@ -2,9 +2,6 @@ %h4 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: nil)), class: "btn btn-sm" - - if current_controller?(:commit) or current_controller?(:merge_requests) - if current_controller?(:commit) = link_to "Plain diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff), class: "btn btn-sm" |