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

- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)
- if diff_view == 'parallel'
  - fluid_layout true

- diff_files = safe_diff_files(diffs, diff_refs)

.content-block.oneline-block.files-changed
  .inline-parallel-buttons
    - if show_whitespace_toggle
      - if current_controller?(:commit)
        = commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs')
      - elsif current_controller?(:merge_requests)
        = diff_merge_request_whitespace_link(@project, @merge_request, class: 'hidden-xs')
    .btn-group
      = inline_diff_btn
      = parallel_diff_btn
  = render 'projects/diffs/stats', diff_files: diff_files

- if diff_files.overflow?
  = render 'projects/diffs/warning', diff_files: diff_files

.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, diff_refs: diff_refs
Update syntax 2016-04-04 12:35:56 -04:00			`- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)`
Don't use params[:view] directly. 2015-11-17 10:08:58 -05:00			`- if diff_view == 'parallel'`
Limit content width for big screens except certain pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-08-26 05:51:28 -04:00			`- fluid_layout true`

More refactoring from last code review. #3945 * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs 2016-01-14 16:38:37 -05:00			`- diff_files = safe_diff_files(diffs, diff_refs)`
Show additions/deletions stats on merge request diff Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-10-01 07:52:08 -04:00
Diff touch ups 2016-04-07 15:36:53 -04:00			`.content-block.oneline-block.files-changed`
Improve diff UI and mr compare page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2015-09-08 11:22:26 -04:00			`.inline-parallel-buttons`
Hide whitespace toggle button for new merge requests 2016-03-29 17:13:39 -04:00			`- if show_whitespace_toggle`
			`- if current_controller?(:commit)`
Hide button on mobile 2016-04-18 17:51:41 -04:00			`= commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs')`
Update syntax 2016-04-04 12:35:56 -04:00			`- elsif current_controller?(:merge_requests)`
Hide button on mobile 2016-04-18 17:51:41 -04:00			`= diff_merge_request_whitespace_link(@project, @merge_request, class: 'hidden-xs')`
Improve sticky headers in diffs * disable sticky headers in discussion * enable sticky header on mr page with you click changes tab 2015-03-24 22:00:00 -04: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 07:32:49 -05: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 09:51:28 -04: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 12:06:51 -04:00
Use Gitlab::Git::DiffCollections 2016-03-03 12:38:44 -05:00			`- if diff_files.overflow?`
			`= render 'projects/diffs/warning', diff_files: diff_files`
Refactor diff views Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-09-08 09:26:49 -04: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 12:06:51 -04:00			`- diff_files.each_with_index do \|diff_file, index\|`
Correctly find last known blob for file deleted in MR. 2015-10-20 08:23:56 -04: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 06:31:02 -04:00			`- next unless blob`

			`= render 'projects/diffs/file', i: index, project: project,`
Fix bug where wrong commit ID was being used in a merge request diff to show old image Closes #3769 Closes #14327 2016-03-18 09:12:19 -04:00			`diff_file: diff_file, diff_commit: diff_commit, blob: blob, diff_refs: diff_refs`