Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
cd108a82
Commit
cd108a82
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-use issuable_form for new merge request
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
3f228230
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
69 deletions
+6
-69
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+6
-69
No files found.
app/views/projects/merge_requests/_new_submit.html.haml
View file @
cd108a82
...
@@ -9,76 +9,13 @@
...
@@ -9,76 +9,13 @@
%span
.pull-right
%span
.pull-right
=
link_to
'Change branches'
,
mr_change_branches_path
(
@merge_request
)
=
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
.merge-request-form-info
.form-group
=
render
'projects/issuable_form'
,
f:
f
,
issuable:
@merge_request
=
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_project_id
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_branch
=
f
.
hidden_field
:target_branch
=
f
.
submit
'Submit merge request'
,
class:
'btn btn-create'
.mr-compare.merge-request
.mr-compare.merge-request
%ul
.nav.nav-tabs.merge-request-tabs
%ul
.nav.nav-tabs.merge-request-tabs
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment