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

- environment = local_assigns.fetch(:environment, nil)
- file_hash = hexdigest(diff_file.file_path)
.diff-file.file-holder{ id: file_hash, data: diff_file_html_data(project, diff_file.file_path, diff_file.content_sha) }
  .js-file-title.file-title-flex-parent
    .file-header-content
      = render "projects/diffs/file_header", diff_file: diff_file, url: "##{file_hash}"

    - unless diff_file.submodule?
      - blob = diff_file.blob
      .file-actions.hidden-xs
        - if blob.readable_text?
          = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', 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_button(diff_file.content_sha, diff_file.file_path, project)
        = view_on_environment_button(diff_file.content_sha, diff_file.file_path, environment) if environment

  = render 'projects/fork_suggestion'

  = render 'projects/diffs/content', diff_file: diff_file
Add 'View on [env]' link to blobs and individual files in diffs 2017-01-29 14:38:00 -05:00			`- environment = local_assigns.fetch(:environment, nil)`
Clean up diff rendering 2017-05-15 13:18:19 -04:00			`- file_hash = hexdigest(diff_file.file_path)`
Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-15 14:19:49 -04:00			`.diff-file.file-holder{ id: file_hash, data: diff_file_html_data(project, diff_file.file_path, diff_file.content_sha) }`
Use a new class to keep old behavior 2017-02-05 17:28:48 -05:00			`.js-file-title.file-title-flex-parent`
Align file header items while keeping collapse functionality 2017-02-08 18:06:04 -05:00			`.file-header-content`
Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-15 14:19:49 -04:00			`= render "projects/diffs/file_header", diff_file: diff_file, 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?`
Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-15 14:19:49 -04:00			`- blob = diff_file.blob`
Remove fixed class from file actions 2017-01-18 17:48:51 -05:00			`.file-actions.hidden-xs`
Use Blob methods instead of BlobHelper helpers 2017-04-13 12:57:43 -04:00			`- if blob.readable_text?`
unifies mr diff file button style 2017-01-30 05:58:30 -05:00			`= link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', 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
Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-15 14:19:49 -04:00			`= view_file_button(diff_file.content_sha, diff_file.file_path, project)`
			`= view_on_environment_button(diff_file.content_sha, diff_file.file_path, environment) if environment`
Refactor diff views Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-09-08 09:26:49 -04:00
Fix diffs with edit-forking needs Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276 2017-04-22 01:54:03 -04:00			`= render 'projects/fork_suggestion'`

Pass fallback_diff_refs to Diff::File instead of using view helpers 2017-05-15 14:19:49 -04:00			`= render 'projects/diffs/content', diff_file: diff_file`