Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
423ffe29
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 搜索 >>
未验证
提交
423ffe29
编写于
1月 03, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix alerts
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
779355ae
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
4 deletion
+4
-4
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_ci.html.haml
app/views/projects/merge_requests/show/_mr_ci.html.haml
+2
-2
未找到文件。
app/views/projects/merge_requests/_show.html.haml
浏览文件 @
423ffe29
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
=
render
"projects/merge_requests/show/commits"
=
render
"projects/merge_requests/show/commits"
-
if
@commits
.
present?
-
if
@commits
.
present?
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
.append-bottom-10
%li
.notes-tab
{
data:
{
action:
'notes'
}}
%li
.notes-tab
{
data:
{
action:
'notes'
}}
=
link_to
project_merge_request_path
(
@project
,
@merge_request
)
do
=
link_to
project_merge_request_path
(
@project
,
@merge_request
)
do
%i
.icon-comment
%i
.icon-comment
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
浏览文件 @
423ffe29
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
%strong
This request can't be merged with GitLab. You should do it manually
%strong
This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked
.automerge_widget.unchecked
.alert
.alert
.alert-warning
%strong
%strong
%i
.icon-refresh
%i
.icon-refresh
Checking for ability to automatically merge…
Checking for ability to automatically merge…
...
...
app/views/projects/merge_requests/show/_mr_ci.html.haml
浏览文件 @
423ffe29
...
@@ -16,14 +16,14 @@
...
@@ -16,14 +16,14 @@
-
[
:running
,
:pending
].
each
do
|
status
|
-
[
:running
,
:pending
].
each
do
|
status
|
.ci_widget
{
class:
"ci-#{status}"
,
style:
"display:none"
}
.ci_widget
{
class:
"ci-#{status}"
,
style:
"display:none"
}
.alert
.alert
.alert-warning
%i
.icon-time
%i
.icon-time
%strong
CI build
#{
status
}
%strong
CI build
#{
status
}
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
#{
@merge_request
.
last_commit_short_sha
}
.
=
link_to
"Build page"
,
ci_build_details_path
(
@merge_request
)
=
link_to
"Build page"
,
ci_build_details_path
(
@merge_request
)
.ci_widget
.ci_widget
.alert
.alert
.alert-warning
%strong
%strong
%i
.icon-refresh
%i
.icon-refresh
Checking for CI status for
#{
@merge_request
.
last_commit_short_sha
}
Checking for CI status for
#{
@merge_request
.
last_commit_short_sha
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录