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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d3d0775a
Commit
d3d0775a
authored
Jun 13, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Exclude info rows from milestone sorting items
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
04e8b518
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
app/assets/javascripts/milestone.js.coffee
app/assets/javascripts/milestone.js.coffee
+2
-0
app/views/projects/milestones/_issues.html.haml
app/views/projects/milestones/_issues.html.haml
+1
-1
app/views/projects/milestones/_merge_requests.html.haml
app/views/projects/milestones/_merge_requests.html.haml
+1
-1
No files found.
app/assets/javascripts/milestone.js.coffee
View file @
d3d0775a
...
@@ -55,6 +55,7 @@ class Milestone
...
@@ -55,6 +55,7 @@ class Milestone
$
(
"#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed"
).
sortable
(
$
(
"#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed"
).
sortable
(
connectWith
:
".issues-sortable-list"
,
connectWith
:
".issues-sortable-list"
,
dropOnEmpty
:
true
,
dropOnEmpty
:
true
,
items
:
"li:not(.ui-sort-disabled)"
,
update
:
(
event
,
ui
)
->
update
:
(
event
,
ui
)
->
data
=
$
(
this
).
sortable
(
"serialize"
)
data
=
$
(
this
).
sortable
(
"serialize"
)
Milestone
.
sortIssues
(
data
)
Milestone
.
sortIssues
(
data
)
...
@@ -83,6 +84,7 @@ class Milestone
...
@@ -83,6 +84,7 @@ class Milestone
$
(
"#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed"
).
sortable
(
$
(
"#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed"
).
sortable
(
connectWith
:
".merge_requests-sortable-list"
,
connectWith
:
".merge_requests-sortable-list"
,
dropOnEmpty
:
true
,
dropOnEmpty
:
true
,
items
:
"li:not(.ui-sort-disabled)"
,
update
:
(
event
,
ui
)
->
update
:
(
event
,
ui
)
->
data
=
$
(
this
).
sortable
(
"serialize"
)
data
=
$
(
this
).
sortable
(
"serialize"
)
Milestone
.
sortMergeRequests
(
data
)
Milestone
.
sortMergeRequests
(
data
)
...
...
app/views/projects/milestones/_issues.html.haml
View file @
d3d0775a
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
%ul
{
class:
"well-list issues-sortable-list"
,
id:
"issues-list-#{id}"
,
"data-state"
=>
id
}
%ul
{
class:
"well-list issues-sortable-list"
,
id:
"issues-list-#{id}"
,
"data-state"
=>
id
}
-
issues
.
sort_by
(
&
:position
).
each
do
|
issue
|
-
issues
.
sort_by
(
&
:position
).
each
do
|
issue
|
=
render
'issue'
,
issue:
issue
=
render
'issue'
,
issue:
issue
%li
.light
Drag and drop available
%li
.light
.ui-sort-disabled
Drag and drop available
app/views/projects/milestones/_merge_requests.html.haml
View file @
d3d0775a
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
%ul
{
class:
"well-list merge_requests-sortable-list"
,
id:
"merge_requests-list-#{id}"
,
"data-state"
=>
id
}
%ul
{
class:
"well-list merge_requests-sortable-list"
,
id:
"merge_requests-list-#{id}"
,
"data-state"
=>
id
}
-
merge_requests
.
sort_by
(
&
:position
).
each
do
|
merge_request
|
-
merge_requests
.
sort_by
(
&
:position
).
each
do
|
merge_request
|
=
render
'merge_request'
,
merge_request:
merge_request
=
render
'merge_request'
,
merge_request:
merge_request
%li
.light
Drag and drop available
%li
.light
.ui-sort-disabled
Drag and drop available
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