Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
54aca18c
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,发现更多精彩内容 >>
提交
54aca18c
编写于
3月 22, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Contribution calendar will use events instead of commits to count contributions
上级
43afe46b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
14 deletion
+12
-14
app/views/users/calendar.html.haml
app/views/users/calendar.html.haml
+4
-1
features/steps/user.rb
features/steps/user.rb
+1
-1
lib/gitlab/contributions_calendar.rb
lib/gitlab/contributions_calendar.rb
+7
-12
未找到文件。
app/views/users/calendar.html.haml
浏览文件 @
54aca18c
%h4
Contributions calendar
%h4
Contributions calendar
.pull-right
%small
Issues, merge requests and push events
#cal-heatmap
.calendar
:javascript
new
calendar
(
...
...
features/steps/user.rb
浏览文件 @
54aca18c
...
...
@@ -35,7 +35,7 @@ class Spinach::Features::User < Spinach::FeatureSteps
step
'I should see contributions calendar'
do
within
'.calendar'
do
page
.
should
have_css
(
'.graph-rect.r
2.q2
'
)
page
.
should
have_css
(
'.graph-rect.r
3.q3
'
)
end
end
...
...
lib/gitlab/contributions_calendar.rb
浏览文件 @
54aca18c
...
...
@@ -15,25 +15,20 @@ module Gitlab
date_to
=
Date
.
today
events
=
Event
.
contributions
.
where
(
author_id:
user
.
id
).
where
(
"created_at > ?"
,
date_from
).
where
(
project_id:
projects
)
where
(
"created_at > ?"
,
date_from
).
where
(
project_id:
projects
).
group
(
'date(created_at)'
).
select
(
'date(created_at), count(id) as total_amount'
).
reorder
(
nil
).
map
(
&
:attributes
)
grouped_events
=
events
.
to_a
.
group_by
{
|
event
|
event
.
created_at
.
to_date
.
to_s
}
dates
=
(
1
.
year
.
ago
.
to_date
..
(
Date
.
today
+
1
.
day
)).
to_a
dates
.
each
do
|
date
|
date_id
=
date
.
to_time
.
to_i
.
to_s
@timestamps
[
date_id
]
=
0
day_events
=
events
.
find
{
|
day_events
|
day_events
[
"date"
]
==
date
}
if
grouped_events
.
has_key?
(
date
.
to_s
)
grouped_events
[
date
.
to_s
].
each
do
|
event
|
if
event
.
created_at
.
to_date
==
date
if
event
.
issue?
||
event
.
merge_request?
@timestamps
[
date_id
]
+=
1
elsif
event
.
push?
@timestamps
[
date_id
]
+=
event
.
commits_count
end
end
end
if
day_events
@timestamps
[
date_id
]
=
day_events
[
"total_amount"
]
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录