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
Léo-Paul Géneau
gitlab-ce
Commits
5b374226
Commit
5b374226
authored
Apr 15, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Indented code
parent
970b2ed9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+8
-8
No files found.
app/views/projects/merge_requests/_new_compare.html.haml
View file @
5b374226
...
@@ -17,8 +17,8 @@
...
@@ -17,8 +17,8 @@
=
dropdown_filter
(
"Search projects"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
do
=
dropdown_content
do
=
render
'projects/merge_requests/dropdowns/project'
,
=
render
'projects/merge_requests/dropdowns/project'
,
projects:
[
@merge_request
.
source_project
],
projects:
[
@merge_request
.
source_project
],
selected:
f
.
object
.
source_project_id
selected:
f
.
object
.
source_project_id
.merge-request-select.dropdown
.merge-request-select.dropdown
=
f
.
hidden_field
:source_branch
=
f
.
hidden_field
:source_branch
=
dropdown_toggle
"Select source branch"
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_branch]"
},
{
toggle_class:
"js-compare-dropdown js-source-branch"
}
=
dropdown_toggle
"Select source branch"
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_branch]"
},
{
toggle_class:
"js-compare-dropdown js-source-branch"
}
...
@@ -27,8 +27,8 @@
...
@@ -27,8 +27,8 @@
=
dropdown_filter
(
"Search branches"
)
=
dropdown_filter
(
"Search branches"
)
=
dropdown_content
do
=
dropdown_content
do
=
render
'projects/merge_requests/dropdowns/branch'
,
=
render
'projects/merge_requests/dropdowns/branch'
,
branches:
@merge_request
.
source_branches
,
branches:
@merge_request
.
source_branches
,
selected:
f
.
object
.
source_branch
selected:
f
.
object
.
source_branch
.panel-footer
.panel-footer
=
icon
(
'spinner spin'
,
class:
'js-source-loading'
)
=
icon
(
'spinner spin'
,
class:
'js-source-loading'
)
%ul
.list-unstyled.mr_source_commit
%ul
.list-unstyled.mr_source_commit
...
@@ -47,8 +47,8 @@
...
@@ -47,8 +47,8 @@
=
dropdown_filter
(
"Search projects"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
do
=
dropdown_content
do
=
render
'projects/merge_requests/dropdowns/project'
,
=
render
'projects/merge_requests/dropdowns/project'
,
projects:
projects
,
projects:
projects
,
selected:
f
.
object
.
target_project_id
selected:
f
.
object
.
target_project_id
.merge-request-select.dropdown
.merge-request-select.dropdown
=
f
.
hidden_field
:target_branch
=
f
.
hidden_field
:target_branch
=
dropdown_toggle
f
.
object
.
target_branch
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[target_branch]"
},
{
toggle_class:
"js-compare-dropdown js-target-branch"
}
=
dropdown_toggle
f
.
object
.
target_branch
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[target_branch]"
},
{
toggle_class:
"js-compare-dropdown js-target-branch"
}
...
@@ -57,8 +57,8 @@
...
@@ -57,8 +57,8 @@
=
dropdown_filter
(
"Search branches"
)
=
dropdown_filter
(
"Search branches"
)
=
dropdown_content
do
=
dropdown_content
do
=
render
'projects/merge_requests/dropdowns/branch'
,
=
render
'projects/merge_requests/dropdowns/branch'
,
branches:
@merge_request
.
target_branches
,
branches:
@merge_request
.
target_branches
,
selected:
f
.
object
.
target_branch
selected:
f
.
object
.
target_branch
.panel-footer
.panel-footer
=
icon
(
'spinner spin'
,
class:
"js-target-loading"
)
=
icon
(
'spinner spin'
,
class:
"js-target-loading"
)
%ul
.list-unstyled.mr_target_commit
%ul
.list-unstyled.mr_target_commit
...
...
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