Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d8462638
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,发现更多精彩内容 >>
提交
d8462638
编写于
11月 02, 2017
作者:
G
George Andrinopoulos
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix collapsed sidebar messages and icon
上级
f39fe4d8
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
6 deletion
+18
-6
app/models/global_milestone.rb
app/models/global_milestone.rb
+1
-1
app/models/milestone.rb
app/models/milestone.rb
+1
-1
app/views/shared/icons/_icon_hourglass.svg
app/views/shared/icons/_icon_hourglass.svg
+1
-0
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+10
-4
changelogs/unreleased/39335-add-time-spend-to-milestones.yml
changelogs/unreleased/39335-add-time-spend-to-milestones.yml
+5
-0
未找到文件。
app/models/global_milestone.rb
浏览文件 @
d8462638
...
...
@@ -158,6 +158,6 @@ class GlobalMilestone
end
def
human_total_time_spent
Gitlab
::
TimeTrackingFormatter
.
output
(
total_time_spent
)
||
0
Gitlab
::
TimeTrackingFormatter
.
output
(
total_time_spent
)
end
end
app/models/milestone.rb
浏览文件 @
d8462638
...
...
@@ -218,7 +218,7 @@ class Milestone < ActiveRecord::Base
end
def
human_total_time_spent
Gitlab
::
TimeTrackingFormatter
.
output
(
total_time_spent
)
||
0
Gitlab
::
TimeTrackingFormatter
.
output
(
total_time_spent
)
end
private
...
...
app/views/shared/icons/_icon_hourglass.svg
0 → 100644
浏览文件 @
d8462638
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"16"
height=
"16"
viewBox=
"0 0 16 16"
><path
d=
"M10.331 4.889A2.988 2.988 0 0 0 11 3V2H5v1c0 .362.064.709.182 1.03l5.15.859zM3 14v-1c0-1.78.93-3.342 2.33-4.228.447-.327.67-.582.67-.764 0-.19-.242-.46-.725-.815A4.996 4.996 0 0 1 3 3V2H2a1 1 0 1 1 0-2h12a1 1 0 0 1 0 2h-1v1a4.997 4.997 0 0 1-2.39 4.266c-.407.3-.61.545-.61.734 0 .19.203.434.61.734A4.997 4.997 0 0 1 13 13v1h1a1 1 0 0 1 0 2H2a1 1 0 0 1 0-2h1zm8 0v-1a3 3 0 0 0-6 0v1h6z"
/></svg>
app/views/shared/milestones/_sidebar.html.haml
浏览文件 @
d8462638
...
...
@@ -87,13 +87,19 @@
.block.time_spent
.sidebar-collapsed-icon
%strong
=
custom_icon
(
'icon_clock_o'
)
%span
=
milestone
.
human_total_time_spent
=
custom_icon
(
'icon_hourglass'
)
%span
.collapsed-milestone-total-time-spent
-
if
milestone
.
human_total_time_spent
=
milestone
.
human_total_time_spent
-
else
None
.title.hide-collapsed
Total time spent
.value.hide-collapsed
=
milestone
.
human_total_time_spent
-
if
milestone
.
human_total_time_spent
%span
.bold
=
milestone
.
human_total_time_spent
-
else
%span
.no-value
No time spent
.block.merge-requests
.sidebar-collapsed-icon
...
...
changelogs/unreleased/39335-add-time-spend-to-milestones.yml
0 → 100644
浏览文件 @
d8462638
---
title
:
Add total time spent to milestones
merge_request
:
15116
author
:
George Andrinopoulos
type
:
added
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录