Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f38a6d6e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
f38a6d6e
编写于
12月 11, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added LFS badge to indicate LFS tracked files
Closes #15567
上级
12d33b88
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
0 deletion
+17
-0
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+5
-0
app/controllers/projects/tree_controller.rb
app/controllers/projects/tree_controller.rb
+1
-0
app/views/projects/blob/_header_content.html.haml
app/views/projects/blob/_header_content.html.haml
+3
-0
app/views/projects/tree/_blob_item.html.haml
app/views/projects/tree/_blob_item.html.haml
+3
-0
changelogs/unreleased/lfs-badge.yml
changelogs/unreleased/lfs-badge.yml
+5
-0
未找到文件。
app/assets/stylesheets/framework/files.scss
浏览文件 @
f38a6d6e
...
...
@@ -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
;
}
app/controllers/projects/tree_controller.rb
浏览文件 @
f38a6d6e
...
...
@@ -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
...
...
app/views/projects/blob/_header_content.html.haml
浏览文件 @
f38a6d6e
...
...
@@ -8,3 +8,6 @@
%small
=
number_to_human_size
(
blob
.
raw_size
)
-
if
blob
.
stored_externally?
%span
.label.label-lfs.append-right-5
LFS
app/views/projects/tree/_blob_item.html.haml
浏览文件 @
f38a6d6e
-
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'
changelogs/unreleased/lfs-badge.yml
0 → 100644
浏览文件 @
f38a6d6e
---
title
:
Added badge to tree & blob views to indicate LFS tracked files
merge_request
:
author
:
type
:
added
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录