Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
020e6168
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 搜索 >>
提交
020e6168
编写于
5月 12, 2016
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reduce duplication and branching logic in EventsHelper
Remove unused methods from Event model
上级
0ec2ee71
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
54 deletion
+25
-54
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+15
-41
app/models/event.rb
app/models/event.rb
+8
-13
app/models/project.rb
app/models/project.rb
+2
-0
未找到文件。
app/helpers/events_helper.rb
浏览文件 @
020e6168
...
...
@@ -57,11 +57,7 @@ module EventsHelper
words
<<
event
.
ref_name
words
<<
"at"
elsif
event
.
commented?
if
event
.
commit_note?
words
<<
event
.
note_short_commit_id
else
words
<<
"#
#{
truncate
event
.
note_target_iid
}
"
end
words
<<
event
.
note_target_reference
words
<<
"at"
elsif
event
.
milestone?
words
<<
"#
#{
event
.
target_iid
}
"
if
event
.
target_iid
...
...
@@ -89,16 +85,7 @@ module EventsHelper
event
.
note_target
)
elsif
event
.
note?
if
event
.
note_target
if
event
.
commit_note?
namespace_project_commit_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
note_commit_id
,
anchor:
dom_id
(
event
.
target
))
elsif
event
.
project_snippet_note?
namespace_project_snippet_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
note_target
)
else
event_note_target_path
(
event
)
end
event_note_target_path
(
event
)
end
elsif
event
.
push?
push_event_feed_url
(
event
)
...
...
@@ -135,42 +122,29 @@ module EventsHelper
def
event_note_target_path
(
event
)
if
event
.
note?
&&
event
.
commit_note?
namespace_project_commit_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
note_target
)
namespace_project_commit_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
note_target
,
anchor:
dom_id
(
event
.
target
))
elsif
event
.
project_snippet_note?
namespace_project_snippet_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
note_target
,
anchor:
dom_id
(
event
.
target
))
else
polymorphic_path
([
event
.
project
.
namespace
.
becomes
(
Namespace
),
event
.
project
,
event
.
note_target
],
anchor:
dom_id
(
event
.
target
))
anchor:
dom_id
(
event
.
target
))
end
end
def
event_note_title_html
(
event
)
if
event
.
note_target
if
event
.
commit_note?
link_to
(
namespace_project_commit_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
note_commit_id
,
anchor:
dom_id
(
event
.
target
)),
title:
event
.
target_title
,
class:
"commit_short_id"
)
do
"
#{
event
.
note_target_type
}
#{
event
.
note_short_commit_id
}
"
end
elsif
event
.
project_snippet_note?
link_to
(
namespace_project_snippet_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
note_target
),
title:
event
.
project
.
name
)
do
"
#{
event
.
note_target_type
}
#{
truncate
event
.
note_target
.
to_reference
}
"
end
else
link_to
event_note_target_path
(
event
),
title:
event
.
target_title
do
"
#{
event
.
note_target_type
}
#{
truncate
event
.
note_target
.
to_reference
}
"
end
link_to
(
event_note_target_path
(
event
),
title:
event
.
target_title
,
class:
'has-tooltip'
)
do
"
#{
event
.
note_target_type
}
#{
event
.
note_target_reference
}
"
end
else
content_tag
:strong
do
"(deleted)"
end
content_tag
(
:strong
,
'(deleted)'
)
end
end
...
...
app/models/event.rb
浏览文件 @
020e6168
...
...
@@ -266,18 +266,10 @@ class Event < ActiveRecord::Base
branch?
&&
project
.
default_branch
!=
branch_name
end
def
note_commit_id
target
.
commit_id
end
def
target_iid
target
.
respond_to?
(
:iid
)
?
target
.
iid
:
target_id
end
def
note_short_commit_id
Commit
.
truncate_sha
(
note_commit_id
)
end
def
commit_note?
target
.
for_commit?
end
...
...
@@ -302,12 +294,15 @@ class Event < ActiveRecord::Base
end
end
def
note_target_iid
if
note_target
.
respond_to?
(
:iid
)
note_target
.
iid
def
note_target_reference
return
unless
note_target
# Commit#to_reference returns the full SHA, but we want the short one here
if
commit_note?
note_target
.
short_id
else
note_target
_id
end
.
to_s
note_target
.
to_reference
end
end
def
note_target_type
...
...
app/models/project.rb
浏览文件 @
020e6168
...
...
@@ -50,6 +50,8 @@ class Project < ActiveRecord::Base
attr_accessor
:new_default_branch
attr_accessor
:old_path_with_namespace
alias_attribute
:title
,
:name
# Relations
belongs_to
:creator
,
foreign_key:
'creator_id'
,
class_name:
'User'
belongs_to
:group
,
->
{
where
(
type:
Group
)
},
foreign_key:
'namespace_id'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录