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

.diff-file.file-holder{ id: file_hash, data: diff_file_html_data(project, diff_file.file_path, diff_commit.id) }
  .file-title-flex-parent
    = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_commit, project: project, url: "##{file_hash}"

    - unless diff_file.submodule?
      .file-actions-fixed.hidden-xs
        - if blob_text_viewable?(blob)
          = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file", disabled: @diff_notes_disabled do
            = icon('comment')
          \
          - if editable_diff?(diff_file)
            - link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {}
            = edit_blob_link(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path,
                             blob: blob, link_opts: link_opts)

        = view_file_btn(diff_commit.id, diff_file.new_path, project)

  = render 'projects/diffs/content', diff_file: diff_file, diff_commit: diff_commit, blob: blob, project: project
HAMLLint: Fix `SpaceInsideHashAttributes` offences 2016-12-26 05:47:16 -05:00			`.diff-file.file-holder{ id: file_hash, data: diff_file_html_data(project, diff_file.file_path, diff_commit.id) }`
Use flexbox instead of media queries Move CSS to correct file 2017-01-18 12:56:45 -05:00			`.file-title-flex-parent`
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_header", diff_file: diff_file, blob: blob, diff_commit: diff_commit, project: project, url: "##{file_hash}"`
Refactor diff views Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-09-08 09:26:49 -04:00
Style diff and blob file headers the same way 2016-06-20 12:57:10 -04:00			`- unless diff_file.submodule?`
Use flexbox instead of media queries Move CSS to correct file 2017-01-18 12:56:45 -05:00			`.file-actions-fixed.hidden-xs`
Fix specs and behavior for LFS files 2015-12-18 10:14:12 -05:00			`- if blob_text_viewable?(blob)`
fix typo "this files" -> "this file" 2016-09-28 11:22:08 -04:00			`= link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file", disabled: @diff_notes_disabled do`
Update diff colors and icons 2016-03-31 14:37:27 -04:00			`= icon('comment')`
Fix MR diff 'Edit' button 2016-01-21 16:46:49 -05:00			`\`
Improve diff performance by eliminating redundant checks for text blobs On a merge request with over 1000 changed files, there were redundant calls to blob_text_viewable?, which incurred about 7% of the time. Improves #14775 2016-07-30 00:04:04 -04:00			`- if editable_diff?(diff_file)`
Merge branch 'jej-22869' into 'security' Fix information disclosure in `Projects::BlobController#update` It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that. - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) https://gitlab.com/gitlab-org/gitlab-ce/issues/22869 See merge request !2023 2016-11-07 12:09:22 -05:00			`- link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {}`
edit_blob_link can receive the blob to avoid access to the repository 2016-08-17 11:05:00 -04:00			`= edit_blob_link(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path,`
			`blob: blob, link_opts: link_opts)`
Refactor diff views Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-09-08 09:26:49 -04:00
Cache highlighted diff lines for merge requests Introducing the concept of SafeDiffs which relates diffs with UI highlighting. 2016-07-20 12:25:36 -04:00			`= view_file_btn(diff_commit.id, diff_file.new_path, project)`
Refactor diff views Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-09-08 09:26:49 -04:00
Cache highlighted diff lines for merge requests Introducing the concept of SafeDiffs which relates diffs with UI highlighting. 2016-07-20 12:25:36 -04:00			`= render 'projects/diffs/content', diff_file: diff_file, diff_commit: diff_commit, blob: blob, project: project`