diff options
| author | Phil Hughes <me@iamphill.com> | 2017-12-11 12:17:11 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-12-11 12:17:11 +0000 |
| commit | f38a6d6ee610e7301be35740d1cc0e3a1cbd42d0 (patch) | |
| tree | bfd39b0e38fd3328149966ecdc2329f932de9470 | |
| parent | 12d33b883adda7093f0f4b838532871036af3925 (diff) | |
| download | gitlab-ce-f38a6d6ee610e7301be35740d1cc0e3a1cbd42d0.tar.gz | |
Added LFS badge to indicate LFS tracked files
Closes #15567
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 5 | ||||
| -rw-r--r-- | app/controllers/projects/tree_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/projects/blob/_header_content.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/tree/_blob_item.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/lfs-badge.yml | 5 |
5 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 609f33582e1..1588036aeae 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -396,3 +396,8 @@ span.idiff { .file-fork-suggestion-note { margin-right: 1.5em; } + +.label-lfs { + color: $common-gray-light; + border: 1px solid $common-gray-light; +} diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb index f3719059f88..d56361eb3a5 100644 --- a/app/controllers/projects/tree_controller.rb +++ b/app/controllers/projects/tree_controller.rb @@ -26,6 +26,7 @@ class Projects::TreeController < Projects::ApplicationController respond_to do |format| format.html do + @lfs_blobs = Gitlab::Git::Blob.batch_lfs_pointers(@project.repository, @tree.blobs.map(&:id)) @last_commit = @repository.last_commit_for_path(@commit.id, @tree.path) || @commit end diff --git a/app/views/projects/blob/_header_content.html.haml b/app/views/projects/blob/_header_content.html.haml index 98bedae650a..cf7619eb547 100644 --- a/app/views/projects/blob/_header_content.html.haml +++ b/app/views/projects/blob/_header_content.html.haml @@ -8,3 +8,6 @@ %small = number_to_human_size(blob.raw_size) + + - if blob.stored_externally? + %span.label.label-lfs.append-right-5 LFS diff --git a/app/views/projects/tree/_blob_item.html.haml b/app/views/projects/tree/_blob_item.html.haml index c51af901699..d1ab49920eb 100644 --- a/app/views/projects/tree/_blob_item.html.haml +++ b/app/views/projects/tree/_blob_item.html.haml @@ -1,9 +1,12 @@ +- is_lfs_blob = @lfs_blobs.select{|b| b.id === blob_item.id }.any? %tr{ class: "tree-item #{tree_hex_class(blob_item)}" } %td.tree-item-file-name = tree_icon(type, blob_item.mode, blob_item.name) - file_name = blob_item.name = link_to project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name)), class: 'str-truncated', title: file_name do %span= file_name + - if is_lfs_blob + %span.label.label-lfs.prepend-left-5 LFS %td.hidden-xs.tree-commit %td.tree-time-ago.cgray.text-right = render 'projects/tree/spinner' diff --git a/changelogs/unreleased/lfs-badge.yml b/changelogs/unreleased/lfs-badge.yml new file mode 100644 index 00000000000..e4ed4d6741f --- /dev/null +++ b/changelogs/unreleased/lfs-badge.yml @@ -0,0 +1,5 @@ +--- +title: Added badge to tree & blob views to indicate LFS tracked files +merge_request: +author: +type: added |