gitlab-org--gitlab-foss/app/views/projects/diffs/_diffs.html.haml

- if params[:view] == 'parallel'
  - fluid_layout true

- diff_files = safe_diff_files(diffs)

.gray-content-block.second-block.oneline-block
  .inline-parallel-buttons
    .btn-group
      = inline_diff_btn
      = parallel_diff_btn
  = render 'projects/diffs/stats', diff_files: diff_files

- if diff_files.count < diffs.size
  = render 'projects/diffs/warning', diffs: diffs, shown_files_count: diff_files.count

.files
  - diff_files.each_with_index do |diff_file, index|
    - diff_commit = commit_for_diff(diff_file)
    - blob = project.repository.blob_for_diff(diff_commit, diff_file)
    - next unless blob

    = render 'projects/diffs/file', i: index, project: project,
      diff_file: diff_file, diff_commit: diff_commit, blob: blob

- if @diff_timeout
  .alert.alert-danger
    %h4
      Failed to collect changes
    %p
      Maybe diff is really big and operation failed with timeout. Try to get diff locally
Limit content width for big screens except certain pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-08-26 09:51:28 +00:00			`- if params[:view] == 'parallel'`
			`- fluid_layout true`

Show additions/deletions stats on merge request diff Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-10-01 11:52:08 +00:00			`- diff_files = safe_diff_files(diffs)`

Small UI improvements to merge request page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-11-06 15:27:18 +00:00			`.gray-content-block.second-block.oneline-block`
Improve diff UI and mr compare page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-09-08 15:22:26 +00:00			`.inline-parallel-buttons`
Improve sticky headers in diffs * disable sticky headers in discussion * enable sticky header on mr page with you click changes tab 2015-03-25 02:00:00 +00:00			`.btn-group`
Set of UI changes mostly for issue and merge request * return edit/close buttons to old position (right of title) * make 'Issue #1' header smaller * move mr commits to separate tab * change inline/side diff switcher to buttons from tabs * make issue sidebar start with dicsussion block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-12-25 12:32:49 +00:00			`= inline_diff_btn`
			`= parallel_diff_btn`
Avoid unnecessary usage of local vars Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-10-01 13:51:28 +00:00			`= render 'projects/diffs/stats', diff_files: diff_files`
Improve handling of large diffs Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines. 2015-04-27 16:06:51 +00:00
			`- if diff_files.count < diffs.size`
			`= render 'projects/diffs/warning', diffs: diffs, shown_files_count: diff_files.count`
Refactor diff views Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-09-08 13:26:49 +00:00
			`.files`
Improve handling of large diffs Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines. 2015-04-27 16:06:51 +00:00			`- diff_files.each_with_index do \|diff_file, index\|`
Correctly find last known blob for file deleted in MR. 2015-10-20 12:23:56 +00:00			`- diff_commit = commit_for_diff(diff_file)`
			`- blob = project.repository.blob_for_diff(diff_commit, diff_file)`
Fix bug when removed file was not appearing in merge request diff Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-09-30 10:31:02 +00:00			`- next unless blob`

			`= render 'projects/diffs/file', i: index, project: project,`
			`diff_file: diff_file, diff_commit: diff_commit, blob: blob`
Refactor diff views Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-09-08 13:26:49 +00:00
			`- if @diff_timeout`
			`.alert.alert-danger`
			`%h4`
			`Failed to collect changes`
			`%p`
Typo localy -> locally. 2014-09-10 20:20:40 +00:00			`Maybe diff is really big and operation failed with timeout. Try to get diff locally`