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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
788033a2
Commit
788033a2
authored
10 years ago
by
Ciro Santilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Factor new issue and edit MR forms.
parent
00ccaed0
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
62 deletions
+41
-62
app/views/projects/_issuable_form.html.haml
app/views/projects/_issuable_form.html.haml
+39
-0
app/views/projects/issues/_form.html.haml
app/views/projects/issues/_form.html.haml
+1
-31
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+1
-31
No files found.
app/views/projects/_issuable_form.html.haml
0 → 100644
View file @
788033a2
.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
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
.col-sm-10
=
f
.
text_area
:description
,
rows:
14
,
class:
'form-control js-gfm-input markdown-area'
.col-sm-12.hint
.pull-left
Parsed with
#{
link_to
'GitLab Flavored Markdown'
,
help_page_path
(
'markdown'
,
'markdown'
),
target:
'_blank'
}
.
.pull-right
Attach images (JPG, PNG, GIF) 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
.icon-user
Assign to
.col-sm-10
=
project_users_select_tag
(
"
#{
issuable
.
class
.
model_name
.
param_key
}
[assignee_id]"
,
placeholder:
'Select a user'
,
class:
'custom-form-control'
,
selected:
issuable
.
assignee_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
.icon-time
Milestone
.col-sm-10
=
f
.
select
(
:milestone_id
,
milestone_options
(
issuable
),
{
include_blank:
'Select milestone'
},
{
class:
'select2'
})
This diff is collapsed.
Click to expand it.
app/views/projects/issues/_form.html.haml
View file @
788033a2
...
...
@@ -16,37 +16,7 @@
-
@issue
.
errors
.
full_messages
.
each
do
|
msg
|
%span
=
msg
%br
.form-group
=
f
.
label
:title
,
class:
'control-label'
do
%strong
=
'Title *'
.col-sm-10
=
f
.
text_field
:title
,
maxlength:
255
,
class:
"form-control js-gfm-input"
,
autofocus:
true
,
required:
true
.form-group
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
.col-sm-10
=
f
.
text_area
:description
,
class:
'form-control js-gfm-input markdown-area'
,
rows:
14
.col-sm-12.hint
.pull-left
Issues are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),
target:
'_blank'
}
.
.pull-right
Attach images (JPG, PNG, GIF) 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
.icon-user
Assign to
.col-sm-10
=
project_users_select_tag
(
'issue[assignee_id]'
,
placeholder:
'Select a user'
,
class:
'custom-form-control'
,
selected:
@issue
.
assignee_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
.icon-time
Milestone
.col-sm-10
=
f
.
select
(
:milestone_id
,
milestone_options
(
@issue
),
{
include_blank:
"Select milestone"
},
{
class:
'select2'
})
=
render
'projects/issuable_form'
,
f:
f
,
issuable:
@issue
.form-group
=
f
.
label
:label_ids
,
class:
'control-label'
do
%i
.icon-tag
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/_form.html.haml
View file @
788033a2
...
...
@@ -15,37 +15,7 @@
%div
=
msg
.merge-request-form-info
.form-group
=
f
.
label
:title
,
class:
'control-label'
do
%strong
=
"Title *"
.col-sm-10
=
f
.
text_field
:title
,
class:
"form-control pad js-gfm-input"
,
maxlength:
255
,
rows:
5
,
required:
true
.form-group
=
f
.
label
:description
,
"Description"
,
class:
'control-label'
.col-sm-10
=
f
.
text_area
:description
,
class:
"form-control js-gfm-input markdown-area"
,
rows:
14
.col-sm-12.hint
.pull-left
Description is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),
target:
'_blank'
}
.
.pull-right
Attach images (JPG, PNG, GIF) 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
.icon-user
Assign to
.col-sm-10
=
project_users_select_tag
(
'merge_request[assignee_id]'
,
placeholder:
'Select a user'
,
class:
'custom-form-control'
,
selected:
@merge_request
.
assignee_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
.icon-time
Milestone
.col-sm-10
=
f
.
select
(
:milestone_id
,
milestone_options
(
@merge_request
),
{
include_blank:
"Select milestone"
},
{
class:
'select2'
})
=
render
'projects/issuable_form'
,
f:
f
,
issuable:
@merge_request
.form-group
=
f
.
label
:label_ids
,
class:
'control-label'
do
%i
.icon-tag
...
...
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