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

34 lines
1.6 KiB
Text
Raw Normal View History

Update syntax
2016-04-04 12:35:56 -04:00
- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)
MergeRequest new form load diff asynchronously
2016-08-11 03:00:17 -04:00
- can_create_note = !@diff_notes_disabled && can?(current_user, :create_note, diffs.project)
Introduce Compare model in the codebase. This object will manage Gitlab::Git::Compare instances
2016-07-27 07:09:52 -04:00
- diff_files = diffs.diff_files
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
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
Collapsed diffs lines/size don't accumulate to overflow diffs.
2016-07-15 03:04:18 -04:00
- if !expand_all_diffs? && diff_files.any? { |diff_file| diff_file.collapsed? }
Fix expand all diffs button in compare view We can't reuse the existing value of the format parameter, because on the merge request page that's 'json', so the link would go to a JSON file. We can't set it to HTML, because that adds '.html' the URL, which breaks the compare view (and looks bad). Setting it to nil uses the default format, which in all of these cases is HTML anyway.
2016-07-26 07:19:02 -04:00
= link_to 'Expand all', url_for(params.merge(expand_all_diffs: 1, format: nil)), class: 'btn btn-default'
Hide whitespace toggle button for new merge requests
2016-03-29 17:13:39 -04:00
- if show_whitespace_toggle
- if current_controller?(:commit)
switch from diff_file_collection to diffs So we have raw_diffs too
2016-07-27 13:00:34 -04:00
= commit_diff_whitespace_link(diffs.project, @commit, class: 'hidden-xs')
Update syntax
2016-04-04 12:35:56 -04:00
- elsif current_controller?(:merge_requests)
switch from diff_file_collection to diffs So we have raw_diffs too
2016-07-27 13:00:34 -04:00
= diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'hidden-xs')
added whitespace toggle to diffs page and set it to return the project compare path with the selected whitespace params Updated CHANGELOG Moved CHANGELOG entry
2016-06-09 13:26:14 -04:00
- elsif current_controller?(:compare)
switch from diff_file_collection to diffs So we have raw_diffs too
2016-07-27 13:00:34 -04:00
= diff_compare_whitespace_link(diffs.project, params[:from], params[:to], 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
MergeRequest new form load diff asynchronously
2016-08-11 03:00:17 -04:00
.files{ data: { can_create_note: can_create_note } }
Unify anchor link format for MR diff files !7298 Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298
2016-11-13 13:18:03 -05:00
- diff_files.each_with_index do |diff_file|
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)
Add DiffFile#blob and #old_blob
2016-06-20 12:54:53 -04:00
- blob = diff_file.blob(diff_commit)
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
switch from diff_file_collection to diffs So we have raw_diffs too
2016-07-27 13:00:34 -04:00
- blob.load_all_data!(diffs.project.repository) unless blob.only_display_raw?
Unify anchor link format for MR diff files !7298 Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298
2016-11-13 13:18:03 -05:00
- file_hash = hexdigest(diff_file.file_path)
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
Unify anchor link format for MR diff files !7298 Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path. Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage. Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format. Inspired by #24010 and !7298
2016-11-13 13:18:03 -05:00
= render 'projects/diffs/file', file_hash: file_hash, project: diffs.project,
switch from diff_file_collection to diffs So we have raw_diffs too
2016-07-27 13:00:34 -04:00
diff_file: diff_file, diff_commit: diff_commit, blob: blob
Copy permalink