BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
850fa65e
Commit
850fa65e
authored
Mar 29, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Checkmarks in dropdowns for already selected values
parent
b3100589
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
commits.scss
app/assets/stylesheets/pages/commits.scss
+1
-0
_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+7
-7
No files found.
app/assets/stylesheets/pages/commits.scss
View file @
850fa65e
...
@@ -47,6 +47,7 @@ li.commit {
...
@@ -47,6 +47,7 @@ li.commit {
.commit_short_id
{
.commit_short_id
{
min-width
:
65px
;
min-width
:
65px
;
color
:
$gl-dark-link-color
;
font-family
:
$monospace_font
;
font-family
:
$monospace_font
;
}
}
...
...
app/views/projects/merge_requests/_new_compare.html.haml
View file @
850fa65e
...
@@ -12,25 +12,25 @@
...
@@ -12,25 +12,25 @@
.merge-request-select.dropdown
.merge-request-select.dropdown
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_project_id
=
dropdown_toggle
@merge_request
.
source_project_path
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_project_id]"
,
disabled:
@merge_request
.
persisted?
},
{
toggle_class:
"js-compare-dropdown js-source-project"
}
=
dropdown_toggle
@merge_request
.
source_project_path
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_project_id]"
,
disabled:
@merge_request
.
persisted?
},
{
toggle_class:
"js-compare-dropdown js-source-project"
}
.dropdown-menu
.dropdown-menu
.dropdown-menu-selectable
=
dropdown_title
(
"Select source project"
)
=
dropdown_title
(
"Select source project"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
do
=
dropdown_content
do
%ul
%ul
%li
%li
%a
{
href:
"#"
,
data:
{
id:
@merge_request
.
source_project
.
id
}
}
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if f.object.source_project_id == @merge_request.source_project.id)}"
,
data:
{
id:
@merge_request
.
source_project
.
id
}
}
=
@merge_request
.
source_project_path
=
@merge_request
.
source_project_path
.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"
}
.dropdown-menu
.dropdown-menu
.dropdown-menu-selectable
=
dropdown_title
(
"Select source branch"
)
=
dropdown_title
(
"Select source branch"
)
=
dropdown_filter
(
"Search branches"
)
=
dropdown_filter
(
"Search branches"
)
=
dropdown_content
do
=
dropdown_content
do
%ul
%ul
-
@merge_request
.
source_branches
.
each
do
|
branch
|
-
@merge_request
.
source_branches
.
each
do
|
branch
|
%li
%li
%a
{
href:
"#"
,
data:
{
id:
branch
}
}
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if f.object.source_branch == branch)}"
,
data:
{
id:
branch
}
}
=
branch
=
branch
.panel-footer
.panel-footer
=
icon
(
'spinner spin'
,
class:
"js-source-loading"
)
=
icon
(
'spinner spin'
,
class:
"js-source-loading"
)
...
@@ -45,14 +45,14 @@
...
@@ -45,14 +45,14 @@
.merge-request-select.dropdown
.merge-request-select.dropdown
=
f
.
hidden_field
:target_project_id
=
f
.
hidden_field
:target_project_id
=
dropdown_toggle
projects
.
first
.
path_with_namespace
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[target_project_id]"
,
disabled:
@merge_request
.
persisted?
},
{
toggle_class:
"js-compare-dropdown js-target-project"
}
=
dropdown_toggle
projects
.
first
.
path_with_namespace
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[target_project_id]"
,
disabled:
@merge_request
.
persisted?
},
{
toggle_class:
"js-compare-dropdown js-target-project"
}
.dropdown-menu
.dropdown-menu
.dropdown-menu-selectable
=
dropdown_title
(
"Select target project"
)
=
dropdown_title
(
"Select target project"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
do
=
dropdown_content
do
%ul
%ul
-
projects
.
each
do
|
project
|
-
projects
.
each
do
|
project
|
%li
%li
%a
{
href:
"#"
}
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if f.object.target_project_id == project.id)}"
,
data:
{
id:
project
.
id
}
}
=
project
.
path_with_namespace
=
project
.
path_with_namespace
.merge-request-select.dropdown
.merge-request-select.dropdown
=
f
.
hidden_field
:target_branch
=
f
.
hidden_field
:target_branch
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
%ul
%ul
-
@merge_request
.
target_branches
.
each
do
|
branch
|
-
@merge_request
.
target_branches
.
each
do
|
branch
|
%li
%li
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if
:
target_branch == branch)}"
,
data:
{
id:
branch
}
}
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if
f.object.
target_branch == branch)}"
,
data:
{
id:
branch
}
}
=
branch
=
branch
.panel-footer
.panel-footer
=
icon
(
'spinner spin'
,
class:
"js-target-loading"
)
=
icon
(
'spinner spin'
,
class:
"js-target-loading"
)
...
...
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