Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cd108a82
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,发现更多精彩内容 >>
未验证
提交
cd108a82
编写于
5月 06, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Re-use issuable_form for new merge request
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
3f228230
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
69 deletion
+6
-69
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+6
-69
未找到文件。
app/views/projects/merge_requests/_new_submit.html.haml
浏览文件 @
cd108a82
...
...
@@ -9,76 +9,13 @@
%span
.pull-right
=
link_to
'Change branches'
,
mr_change_branches_path
(
@merge_request
)
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
"merge-request-form form-horizontal gfm-form"
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
html:
{
class:
'merge-request-form form-horizontal gfm-form'
}
do
|
f
|
.merge-request-form-info
.form-group
=
f
.
label
:title
,
class:
'control-label'
do
%strong
Title *
.col-sm-10
=
f
.
text_field
:title
,
maxlength:
255
,
autofocus:
true
,
class:
'form-control pad js-gfm-input'
,
required:
true
.form-group.issuable-description
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
.col-sm-10
=
render
layout:
'projects/md_preview'
,
locals:
{
preview_class:
"wiki"
}
do
=
render
'projects/zen'
,
f:
f
,
attr: :description
,
classes:
'description form-control'
.col-sm-12-hint
.pull-left
Parsed with
#{
link_to
'Gitlab Flavored Markdown'
,
help_page_path
(
'markdown'
,
'markdown'
),
target:
'_blank'
}
.
.pull-right
Attach files by dragging
&
dropping
or
#{
link_to
'selecting them'
,
'#'
,
class:
'markdown-selector'
}
.
.clearfix
.error-alert
%hr
.form-group
.issue-assignee
=
f
.
label
:assignee_id
,
class:
'control-label'
do
%i
.fa.fa-user
Assign to
.col-sm-10
=
users_select_tag
(
'merge_request[assignee_id]'
,
placeholder:
'Select a user'
,
class:
'custom-form-control'
,
selected:
@merge_request
.
assignee_id
,
project_id:
@merge_request
.
target_project_id
)
=
link_to
'Assign to me'
,
'#'
,
class:
'btn assign-to-me-link'
.form-group
.issue-milestone
=
f
.
label
:milestone_id
,
class:
'control-label'
do
%i
.fa.fa-clock-o
Milestone
.col-sm-10
-
if
milestone_options
(
@merge_request
).
present?
=
f
.
select
(
:milestone_id
,
milestone_options
(
@merge_request
),
{
include_blank:
'Select milestone'
},
{
class:
'select2'
})
-
else
%span
.light
No open milestones available.
-
if
can?
current_user
,
:admin_milestone
,
@merge_request
.
target_project
=
link_to
'Create new milestone'
,
new_namespace_project_milestone_path
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
),
target: :blank
.form-group
=
f
.
label
:label_ids
,
class:
'control-label'
do
%i
.fa.fa-tag
Labels
.col-sm-10
-
if
@merge_request
.
target_project
.
labels
.
any?
=
f
.
collection_select
:label_ids
,
@merge_request
.
target_project
.
labels
.
all
,
:id
,
:name
,
{
selected:
@merge_request
.
label_ids
},
multiple:
true
,
class:
'select2'
-
else
%span
.light
No labels yet.
-
if
can?
current_user
,
:admin_label
,
@merge_request
.
target_project
=
link_to
'Create new label'
,
new_namespace_project_label_path
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
),
target: :blank
.form-actions
-
if
guide_url
=
contribution_guide_url
(
@target_project
)
%p
Please review the
%strong
#{
link_to
'guidelines for contribution'
,
guide_url
}
to this repository.
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_branch
=
f
.
submit
'Submit merge request'
,
class:
'btn btn-create'
=
render
'projects/issuable_form'
,
f:
f
,
issuable:
@merge_request
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_branch
.mr-compare.merge-request
%ul
.nav.nav-tabs.merge-request-tabs
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录