kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/projects/diffs/_diffs.html.haml

31 lines
914 B
Text
Raw Normal View History

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
Update files/diffs to match new layout Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 06:31:31 -05:00
.content-block.oneline-block
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
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
- 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 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,
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 09:26:49 -04:00
- if @diff_timeout
.alert.alert-danger
%h4
Failed to collect changes
%p
Typo localy -> locally.
2014-09-10 16:20:40 -04:00
Maybe diff is really big and operation failed with timeout. Try to get diff locally
Copy permalink