Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6c5e9480
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,体验更适合开发者的 AI 搜索 >>
提交
6c5e9480
编写于
8月 05, 2019
作者:
G
Gosia Ksionek
提交者:
Mayra Cabrera
8月 05, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix error on project name
Add project path to sql query to build proper path
上级
1dfbb27f
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
43 addition
and
31 deletion
+43
-31
app/serializers/analytics_issue_entity.rb
app/serializers/analytics_issue_entity.rb
+1
-1
changelogs/unreleased/fix-name-vs-path-problem-for-cycle-analytics.yml
...released/fix-name-vs-path-problem-for-cycle-analytics.yml
+5
-0
lib/gitlab/cycle_analytics/base_query.rb
lib/gitlab/cycle_analytics/base_query.rb
+10
-3
lib/gitlab/cycle_analytics/code_event_fetcher.rb
lib/gitlab/cycle_analytics/code_event_fetcher.rb
+1
-3
lib/gitlab/cycle_analytics/issue_event_fetcher.rb
lib/gitlab/cycle_analytics/issue_event_fetcher.rb
+1
-3
lib/gitlab/cycle_analytics/issue_helper.rb
lib/gitlab/cycle_analytics/issue_helper.rb
+10
-3
lib/gitlab/cycle_analytics/plan_event_fetcher.rb
lib/gitlab/cycle_analytics/plan_event_fetcher.rb
+1
-3
lib/gitlab/cycle_analytics/plan_helper.rb
lib/gitlab/cycle_analytics/plan_helper.rb
+4
-2
lib/gitlab/cycle_analytics/production_event_fetcher.rb
lib/gitlab/cycle_analytics/production_event_fetcher.rb
+0
-1
lib/gitlab/cycle_analytics/review_event_fetcher.rb
lib/gitlab/cycle_analytics/review_event_fetcher.rb
+1
-3
spec/serializers/analytics_issue_entity_spec.rb
spec/serializers/analytics_issue_entity_spec.rb
+3
-3
spec/serializers/analytics_issue_serializer_spec.rb
spec/serializers/analytics_issue_serializer_spec.rb
+3
-3
spec/serializers/analytics_merge_request_serializer_spec.rb
spec/serializers/analytics_merge_request_serializer_spec.rb
+3
-3
未找到文件。
app/serializers/analytics_issue_entity.rb
浏览文件 @
6c5e9480
...
...
@@ -26,6 +26,6 @@ class AnalyticsIssueEntity < Grape::Entity
private
def
url_to
(
route
,
object
)
public_send
(
"
#{
route
}
_url"
,
object
[
:
path
],
object
[
:name
],
object
[
:iid
].
to_s
)
# rubocop:disable GitlabSecurity/PublicSend
public_send
(
"
#{
route
}
_url"
,
object
[
:
namespace_path
],
object
[
:project_path
],
object
[
:iid
].
to_s
)
# rubocop:disable GitlabSecurity/PublicSend
end
end
changelogs/unreleased/fix-name-vs-path-problem-for-cycle-analytics.yml
0 → 100644
浏览文件 @
6c5e9480
---
title
:
Fix broken issue links and possible 500 error on cycle analytics page when project name and path are different
merge_request
:
31471
author
:
type
:
fixed
lib/gitlab/cycle_analytics/base_query.rb
浏览文件 @
6c5e9480
...
...
@@ -19,9 +19,10 @@ module Gitlab
.
join
(
projects_table
).
on
(
issue_table
[
:project_id
].
eq
(
projects_table
[
:id
]))
.
join
(
routes_table
).
on
(
projects_table
[
:namespace_id
].
eq
(
routes_table
[
:source_id
]))
.
project
(
issue_table
[
:project_id
].
as
(
"project_id"
))
.
where
(
issue_table
[
:project_id
].
in
(
project_ids
))
.
where
(
routes_table
[
:source_type
].
eq
(
'Namespace'
))
.
where
(
issue_table
[
:created_at
].
gteq
(
options
[
:from
]))
.
project
(
projects_table
[
:path
].
as
(
"project_path"
))
.
project
(
routes_table
[
:path
].
as
(
"namespace_path"
))
query
=
limit_query
(
query
,
project_ids
)
# Load merge_requests
...
...
@@ -30,6 +31,12 @@ module Gitlab
query
end
def
limit_query
(
query
,
project_ids
)
query
.
where
(
issue_table
[
:project_id
].
in
(
project_ids
))
.
where
(
routes_table
[
:source_type
].
eq
(
'Namespace'
))
.
where
(
issue_table
[
:created_at
].
gteq
(
options
[
:from
]))
end
def
load_merge_requests
(
query
)
query
.
join
(
mr_table
,
Arel
::
Nodes
::
OuterJoin
)
.
on
(
mr_table
[
:id
].
eq
(
mr_closing_issues_table
[
:merge_request_id
]))
...
...
lib/gitlab/cycle_analytics/code_event_fetcher.rb
浏览文件 @
6c5e9480
...
...
@@ -11,9 +11,7 @@ module Gitlab
mr_table
[
:id
],
mr_table
[
:created_at
],
mr_table
[
:state
],
mr_table
[
:author_id
],
projects_table
[
:name
],
routes_table
[
:path
]]
mr_table
[
:author_id
]]
@order
=
mr_table
[
:created_at
]
super
(
*
args
)
...
...
lib/gitlab/cycle_analytics/issue_event_fetcher.rb
浏览文件 @
6c5e9480
...
...
@@ -10,9 +10,7 @@ module Gitlab
issue_table
[
:iid
],
issue_table
[
:id
],
issue_table
[
:created_at
],
issue_table
[
:author_id
],
projects_table
[
:name
],
routes_table
[
:path
]]
issue_table
[
:author_id
]]
super
(
*
args
)
end
...
...
lib/gitlab/cycle_analytics/issue_helper.rb
浏览文件 @
6c5e9480
...
...
@@ -8,12 +8,19 @@ module Gitlab
.
join
(
projects_table
).
on
(
issue_table
[
:project_id
].
eq
(
projects_table
[
:id
]))
.
join
(
routes_table
).
on
(
projects_table
[
:namespace_id
].
eq
(
routes_table
[
:source_id
]))
.
project
(
issue_table
[
:project_id
].
as
(
"project_id"
))
.
where
(
issue_table
[
:project_id
].
in
(
project_ids
))
.
project
(
projects_table
[
:path
].
as
(
"project_path"
))
.
project
(
routes_table
[
:path
].
as
(
"namespace_path"
))
query
=
limit_query
(
query
,
project_ids
)
query
end
def
limit_query
(
query
,
project_ids
)
query
.
where
(
issue_table
[
:project_id
].
in
(
project_ids
))
.
where
(
routes_table
[
:source_type
].
eq
(
'Namespace'
))
.
where
(
issue_table
[
:created_at
].
gteq
(
options
[
:from
]))
.
where
(
issue_metrics_table
[
:first_added_to_board_at
].
not_eq
(
nil
).
or
(
issue_metrics_table
[
:first_associated_with_milestone_at
].
not_eq
(
nil
)))
query
end
end
end
...
...
lib/gitlab/cycle_analytics/plan_event_fetcher.rb
浏览文件 @
6c5e9480
...
...
@@ -10,9 +10,7 @@ module Gitlab
issue_table
[
:iid
],
issue_table
[
:id
],
issue_table
[
:created_at
],
issue_table
[
:author_id
],
projects_table
[
:name
],
routes_table
[
:path
]]
issue_table
[
:author_id
]]
super
(
*
args
)
end
...
...
lib/gitlab/cycle_analytics/plan_helper.rb
浏览文件 @
6c5e9480
...
...
@@ -8,14 +8,16 @@ module Gitlab
.
join
(
projects_table
).
on
(
issue_table
[
:project_id
].
eq
(
projects_table
[
:id
]))
.
join
(
routes_table
).
on
(
projects_table
[
:namespace_id
].
eq
(
routes_table
[
:source_id
]))
.
project
(
issue_table
[
:project_id
].
as
(
"project_id"
))
.
project
(
projects_table
[
:path
].
as
(
"project_path"
))
.
project
(
routes_table
[
:path
].
as
(
"namespace_path"
))
.
where
(
issue_table
[
:project_id
].
in
(
project_ids
))
.
where
(
routes_table
[
:source_type
].
eq
(
'Namespace'
))
query
=
add_conditions_to
_query
(
query
)
query
=
limit
_query
(
query
)
query
end
def
add_conditions_to
_query
(
query
)
def
limit
_query
(
query
)
query
.
where
(
issue_table
[
:created_at
].
gteq
(
options
[
:from
]))
.
where
(
issue_metrics_table
[
:first_added_to_board_at
].
not_eq
(
nil
).
or
(
issue_metrics_table
[
:first_associated_with_milestone_at
].
not_eq
(
nil
)))
.
where
(
issue_metrics_table
[
:first_mentioned_in_commit_at
].
not_eq
(
nil
))
...
...
lib/gitlab/cycle_analytics/production_event_fetcher.rb
浏览文件 @
6c5e9480
...
...
@@ -11,7 +11,6 @@ module Gitlab
issue_table
[
:id
],
issue_table
[
:created_at
],
issue_table
[
:author_id
],
projects_table
[
:name
],
routes_table
[
:path
]]
super
(
*
args
)
...
...
lib/gitlab/cycle_analytics/review_event_fetcher.rb
浏览文件 @
6c5e9480
...
...
@@ -11,9 +11,7 @@ module Gitlab
mr_table
[
:id
],
mr_table
[
:created_at
],
mr_table
[
:state
],
mr_table
[
:author_id
],
projects_table
[
:name
],
routes_table
[
:path
]]
mr_table
[
:author_id
]]
super
(
*
args
)
end
...
...
spec/serializers/analytics_issue_entity_spec.rb
浏览文件 @
6c5e9480
...
...
@@ -10,12 +10,12 @@ describe AnalyticsIssueEntity do
id:
"1"
,
created_at:
"2016-11-12 15:04:02.948604"
,
author:
user
,
name:
project
.
name
,
path:
project
.
namespace
project_path:
project
.
path
,
namespace_path:
project
.
namespace
.
route
.
path
}
end
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
name:
'my project'
)
}
let
(
:request
)
{
EntityRequest
.
new
(
entity: :merge_request
)
}
let
(
:entity
)
do
...
...
spec/serializers/analytics_issue_serializer_spec.rb
浏览文件 @
6c5e9480
...
...
@@ -8,7 +8,7 @@ describe AnalyticsIssueSerializer do
end
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
name:
'my project'
)
}
let
(
:resource
)
do
{
total_time:
"172802.724419"
,
...
...
@@ -17,8 +17,8 @@ describe AnalyticsIssueSerializer do
id:
"1"
,
created_at:
"2016-11-12 15:04:02.948604"
,
author:
user
,
name:
project
.
name
,
path:
project
.
namespace
project_path:
project
.
path
,
namespace_path:
project
.
namespace
.
route
.
path
}
end
...
...
spec/serializers/analytics_merge_request_serializer_spec.rb
浏览文件 @
6c5e9480
...
...
@@ -8,7 +8,7 @@ describe AnalyticsMergeRequestSerializer do
end
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
,
name:
'my project'
)
}
let
(
:resource
)
do
{
total_time:
"172802.724419"
,
...
...
@@ -18,8 +18,8 @@ describe AnalyticsMergeRequestSerializer do
state:
'open'
,
created_at:
"2016-11-12 15:04:02.948604"
,
author:
user
,
name:
project
.
name
,
path:
project
.
namespace
project_path:
project
.
path
,
namespace_path:
project
.
namespace
.
route
.
path
}
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录