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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c391a72c
Commit
c391a72c
authored
May 25, 2016
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue being ordered twice and callback when moving between states
parent
88c9a057
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
3 deletions
+9
-3
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/milestone.js.coffee
app/assets/javascripts/milestone.js.coffee
+3
-2
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-1
app/models/issue.rb
app/models/issue.rb
+4
-0
No files found.
CHANGELOG
View file @
c391a72c
...
@@ -92,6 +92,7 @@ v 8.9.0
...
@@ -92,6 +92,7 @@ v 8.9.0
- Links from a wiki page to other wiki pages should be rewritten as expected
- Links from a wiki page to other wiki pages should be rewritten as expected
- Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos)
- Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos)
- Added navigation shortcuts to the project pipelines, milestones, builds and forks page. !4393
- Added navigation shortcuts to the project pipelines, milestones, builds and forks page. !4393
- Fix changing issue state columns in milestone view
- Fix issues filter when ordering by milestone
- Fix issues filter when ordering by milestone
- Disable SAML account unlink feature
- Disable SAML account unlink feature
- Added artifacts:when to .gitlab-ci.yml - this requires GitLab Runner 1.3
- Added artifacts:when to .gitlab-ci.yml - this requires GitLab Runner 1.3
...
...
app/assets/javascripts/milestone.js.coffee
View file @
c391a72c
...
@@ -81,6 +81,7 @@ class @Milestone
...
@@ -81,6 +81,7 @@ class @Milestone
stop
:
(
event
,
ui
)
->
stop
:
(
event
,
ui
)
->
$
(
".issues-sortable-list"
).
css
"min-height"
,
"0px"
$
(
".issues-sortable-list"
).
css
"min-height"
,
"0px"
update
:
(
event
,
ui
)
->
update
:
(
event
,
ui
)
->
if
this
==
ui
.
item
.
parent
()[
0
]
data
=
$
(
this
).
sortable
(
"serialize"
)
data
=
$
(
this
).
sortable
(
"serialize"
)
Milestone
.
sortIssues
(
data
)
Milestone
.
sortIssues
(
data
)
...
...
app/controllers/projects/issues_controller.rb
View file @
c391a72c
...
@@ -116,7 +116,7 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -116,7 +116,7 @@ class Projects::IssuesController < Projects::ApplicationController
end
end
end
end
format
.
json
do
format
.
json
do
render
json:
@issue
.
to_json
(
include:
{
milestone:
{},
assignee:
{
methods: :avatar_url
},
labels:
{
methods: :text_color
}
})
render
json:
@issue
.
to_json
(
include:
{
milestone:
{},
assignee:
{
methods: :avatar_url
},
labels:
{
methods: :text_color
}
}
,
methods: :saved
)
end
end
end
end
end
end
...
...
app/models/issue.rb
View file @
c391a72c
...
@@ -190,4 +190,8 @@ class Issue < ActiveRecord::Base
...
@@ -190,4 +190,8 @@ class Issue < ActiveRecord::Base
def
overdue?
def
overdue?
due_date
.
try
(
:past?
)
||
false
due_date
.
try
(
:past?
)
||
false
end
end
def
saved
valid?
end
end
end
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