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
9101444c
Commit
9101444c
authored
Apr 20, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with new MR form layout
parent
34eacc53
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+12
-8
No files found.
app/views/shared/issuable/_form.html.haml
View file @
9101444c
...
@@ -75,6 +75,7 @@
...
@@ -75,6 +75,7 @@
=
f
.
label
:label_ids
,
"Labels"
,
class:
'control-label'
=
f
.
label
:label_ids
,
"Labels"
,
class:
'control-label'
.col-sm-10
{
class:
(
'issuable-form-padding-top'
if
!
has_labels
)
}
.col-sm-10
{
class:
(
'issuable-form-padding-top'
if
!
has_labels
)
}
-
if
has_labels
-
if
has_labels
.issuable-form-select-holder
=
f
.
collection_select
:label_ids
,
issuable
.
project
.
labels
.
all
,
:id
,
:name
,
=
f
.
collection_select
:label_ids
,
issuable
.
project
.
labels
.
all
,
:id
,
:name
,
{
selected:
issuable
.
label_ids
},
multiple:
true
,
class:
'select2'
,
data:
{
placeholder:
"Select labels"
}
{
selected:
issuable
.
label_ids
},
multiple:
true
,
class:
'select2'
,
data:
{
placeholder:
"Select labels"
}
-
else
-
else
...
@@ -88,6 +89,7 @@
...
@@ -88,6 +89,7 @@
.form-group
.form-group
=
label_tag
:move_to_project_id
,
'Move'
,
class:
'control-label'
=
label_tag
:move_to_project_id
,
'Move'
,
class:
'control-label'
.col-sm-10
.col-sm-10
.issuable-form-select-holder
-
projects
=
project_options
(
issuable
,
current_user
,
ability: :admin_issue
)
-
projects
=
project_options
(
issuable
,
current_user
,
ability: :admin_issue
)
=
select_tag
(
:move_to_project_id
,
projects
,
include_blank:
true
,
=
select_tag
(
:move_to_project_id
,
projects
,
include_blank:
true
,
class:
'select2'
,
data:
{
placeholder:
'Select project'
})
class:
'select2'
,
data:
{
placeholder:
'Select project'
})
...
@@ -102,13 +104,15 @@
...
@@ -102,13 +104,15 @@
.form-group
.form-group
=
f
.
label
:source_branch
,
class:
'control-label'
=
f
.
label
:source_branch
,
class:
'control-label'
.col-sm-10
.col-sm-10
.issuable-form-select-holder
=
f
.
select
(
:source_branch
,
[
@merge_request
.
source_branch
],
{
},
{
class:
'source_branch select2 span2'
,
disabled:
true
})
=
f
.
select
(
:source_branch
,
[
@merge_request
.
source_branch
],
{
},
{
class:
'source_branch select2 span2'
,
disabled:
true
})
.form-group
.form-group
=
f
.
label
:target_branch
,
class:
'control-label'
=
f
.
label
:target_branch
,
class:
'control-label'
.col-sm-10
.col-sm-10
.issuable-form-select-holder
=
f
.
select
(
:target_branch
,
@merge_request
.
target_branches
,
{
include_blank:
true
},
{
class:
'target_branch select2 span2'
,
disabled:
@merge_request
.
new_record?
,
data:
{
placeholder:
"Select branch"
}
})
=
f
.
select
(
:target_branch
,
@merge_request
.
target_branches
,
{
include_blank:
true
},
{
class:
'target_branch select2 span2'
,
disabled:
@merge_request
.
new_record?
,
data:
{
placeholder:
"Select branch"
}
})
-
if
@merge_request
.
new_record?
-
if
@merge_request
.
new_record?
%p
.help-block
=
link_to
'Change branches'
,
mr_change_branches_path
(
@merge_request
)
=
link_to
'Change branches'
,
mr_change_branches_path
(
@merge_request
)
-
is_footer
=
!
(
issuable
.
is_a?
(
MergeRequest
)
&&
issuable
.
new_record?
)
-
is_footer
=
!
(
issuable
.
is_a?
(
MergeRequest
)
&&
issuable
.
new_record?
)
...
...
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