Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
613e0bc5
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,发现更多精彩内容 >>
提交
613e0bc5
编写于
3月 17, 2016
作者:
A
Arinde Eniola
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix inconsistency in the header of issue and merge request pages
上级
d1fd2cb8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
13 deletion
+15
-13
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+5
-6
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+10
-7
未找到文件。
app/views/projects/issues/show.html.haml
浏览文件 @
613e0bc5
...
...
@@ -25,17 +25,16 @@
%strong
.identifier
Issue ##{@issue.iid}
%span
.creator
by
opened
.editor-details
.editor-details
=
time_ago_with_tooltip
(
@issue
.
created_at
)
by
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%span
.hidden-xs
=
'@'
+
@issue
.
author
.
username
=
link_to_member
(
@project
,
@issue
.
author
,
avatar:
false
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
=
link_to_member
(
@project
,
@issue
.
author
,
avatar:
false
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@issue
.
created_at
)
.pull-right.issue-btn-group
-
if
can?
(
current_user
,
:create_issue
,
@project
)
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
浏览文件 @
613e0bc5
...
...
@@ -8,18 +8,21 @@
=
icon
(
'angle-double-left'
)
.issue-meta
%strong
.identifier
Merge Request ##{@merge_request.iid}
%span
.hidden-sm.hidden-md.hidden-lg
MR
%span
.hidden-xs
Merge Request
!
#{@merge_request.iid}
%span
.creator
by
opened
.editor-details
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
by
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%span
.hidden-xs
=
'@'
+
@merge_request
.
author
.
username
=
link_to_member
(
@project
,
@merge_request
.
author
,
avatar:
false
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
=
link_to_member
(
@project
,
@merge_request
.
author
,
avatar:
false
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
.issue-btn-group.pull-right
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录