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
Jérome Perrin
gitlab-ce
Commits
eb4320cb
Commit
eb4320cb
authored
Mar 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove assignee/milestone selects from MR form
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a87f0376
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
31 deletions
+14
-31
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+14
-31
No files found.
app/views/projects/merge_requests/_form.html.haml
View file @
eb4320cb
-
if
@repository
.
contribution_guide
&&
!
@merge_request
.
persisted?
-
contribution_guide_url
=
project_blob_path
(
@project
,
tree_join
(
@repository
.
root_ref
,
@repository
.
contribution_guide
.
name
))
.alert.alert-info.col-sm-10.col-sm-offset-2
=
"Please review the <strong>
#{
link_to
"guidelines for contribution"
,
contribution_guide_url
}
</strong> to this repository."
.
html_safe
=
form_for
[
@project
,
@merge_request
],
html:
{
class:
"merge-request-form form-horizontal"
}
do
|
f
|
=
form_for
[
@project
,
@merge_request
],
html:
{
class:
"merge-request-form form-horizontal"
}
do
|
f
|
.row
.col-sm-2
.col-sm-10
-
if
@repository
.
contribution_guide
&&
!
@merge_request
.
persisted?
-
contribution_guide_url
=
project_blob_path
(
@project
,
tree_join
(
@repository
.
root_ref
,
@repository
.
contribution_guide
.
name
))
.alert.alert-info
Please review the
%strong
#{
link_to
"guidelines for contribution"
,
contribution_guide_url
}
to this repository.
-
if
@merge_request
.
errors
.
any?
-
if
@merge_request
.
errors
.
any?
.alert.alert-danger
.alert.alert-danger
%ul
-
@merge_request
.
errors
.
full_messages
.
each
do
|
msg
|
-
@merge_request
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%div
=
msg
.merge-request-branches
.merge-request-branches
.form-group
.form-group
...
@@ -47,24 +52,6 @@
...
@@ -47,24 +52,6 @@
=
f
.
text_area
:description
,
class:
"form-control js-gfm-input"
,
rows:
14
=
f
.
text_area
:description
,
class:
"form-control js-gfm-input"
,
rows:
14
%p
.hint
Description is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
%p
.hint
Description is parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_markdown_path
,
target:
'_blank'
}
.
%hr
.form-group
.merge-request-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 btn-small assign-to-me-link'
.form-group
.merge-request-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'
})
.form-actions
.form-actions
-
if
@merge_request
.
new_record?
-
if
@merge_request
.
new_record?
=
f
.
submit
'Submit merge request'
,
class:
"btn btn-create"
=
f
.
submit
'Submit merge request'
,
class:
"btn btn-create"
...
@@ -96,7 +83,3 @@
...
@@ -96,7 +83,3 @@
target_branch
.
on
(
"
change
"
,
function
()
{
target_branch
.
on
(
"
change
"
,
function
()
{
$
.
get
(
"
#{
branch_to_project_merge_requests_path
(
@source_project
)
}
"
,
{
target_project_id
:
target_project
.
val
(),
ref
:
$
(
this
).
val
()
});
$
.
get
(
"
#{
branch_to_project_merge_requests_path
(
@source_project
)
}
"
,
{
target_project_id
:
target_project
.
val
(),
ref
:
$
(
this
).
val
()
});
});
});
$
(
'
.assign-to-me-link
'
).
on
(
'
click
'
,
function
(
e
){
$
(
'
#merge_request_assignee_id
'
).
val
(
"
#{
current_user
.
id
}
"
).
trigger
(
"
change
"
);
e
.
preventDefault
();
});
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