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
c487c7cf
Commit
c487c7cf
authored
Sep 03, 2019
by
Lee Tickett
Committed by
Clement Ho
Sep 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "DB change, migratoin and changelog"
This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
parent
3d8d394c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/boards/models/issue.js
app/assets/javascripts/boards/models/issue.js
+2
-2
changelogs/unreleased/remove-vue-resource-from-issue.yml
changelogs/unreleased/remove-vue-resource-from-issue.yml
+5
-0
spec/javascripts/boards/issue_spec.js
spec/javascripts/boards/issue_spec.js
+3
-3
No files found.
app/assets/javascripts/boards/models/issue.js
View file @
c487c7cf
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
/* global ListMilestone */
/* global ListMilestone */
/* global ListAssignee */
/* global ListAssignee */
import
Vue
from
'
vue
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
'
./label
'
;
import
'
./label
'
;
import
{
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
{
convertObjectPropsToCamelCase
}
from
'
~/lib/utils/common_utils
'
;
import
IssueProject
from
'
./project
'
;
import
IssueProject
from
'
./project
'
;
...
@@ -133,7 +133,7 @@ class ListIssue {
...
@@ -133,7 +133,7 @@ class ListIssue {
}
}
const
projectPath
=
this
.
project
?
this
.
project
.
path
:
''
;
const
projectPath
=
this
.
project
?
this
.
project
.
path
:
''
;
return
Vue
.
http
.
patch
(
`
${
this
.
path
}
.json`
,
data
).
then
(({
body
=
{}
}
=
{})
=>
{
return
axios
.
patch
(
`
${
this
.
path
}
.json`
,
data
).
then
(({
data
:
body
=
{}
}
=
{})
=>
{
/**
/**
* Since post implementation of Scoped labels, server can reject
* Since post implementation of Scoped labels, server can reject
* same key-ed labels. To keep the UI and server Model consistent,
* same key-ed labels. To keep the UI and server Model consistent,
...
...
changelogs/unreleased/remove-vue-resource-from-issue.yml
0 → 100644
View file @
c487c7cf
---
title
:
Remove vue resource from issue
merge_request
:
32421
author
:
Lee Tickett
type
:
other
spec/javascripts/boards/issue_spec.js
View file @
c487c7cf
/* global ListIssue */
/* global ListIssue */
import
Vue
from
'
vue
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
'
~/boards/models/label
'
;
import
'
~/boards/models/label
'
;
import
'
~/boards/models/assignee
'
;
import
'
~/boards/models/assignee
'
;
import
'
~/boards/models/issue
'
;
import
'
~/boards/models/issue
'
;
...
@@ -175,7 +175,7 @@ describe('Issue model', () => {
...
@@ -175,7 +175,7 @@ describe('Issue model', () => {
describe
(
'
update
'
,
()
=>
{
describe
(
'
update
'
,
()
=>
{
it
(
'
passes assignee ids when there are assignees
'
,
done
=>
{
it
(
'
passes assignee ids when there are assignees
'
,
done
=>
{
spyOn
(
Vue
.
http
,
'
patch
'
).
and
.
callFake
((
url
,
data
)
=>
{
spyOn
(
axios
,
'
patch
'
).
and
.
callFake
((
url
,
data
)
=>
{
expect
(
data
.
issue
.
assignee_ids
).
toEqual
([
1
]);
expect
(
data
.
issue
.
assignee_ids
).
toEqual
([
1
]);
done
();
done
();
return
Promise
.
resolve
();
return
Promise
.
resolve
();
...
@@ -185,7 +185,7 @@ describe('Issue model', () => {
...
@@ -185,7 +185,7 @@ describe('Issue model', () => {
});
});
it
(
'
passes assignee ids of [0] when there are no assignees
'
,
done
=>
{
it
(
'
passes assignee ids of [0] when there are no assignees
'
,
done
=>
{
spyOn
(
Vue
.
http
,
'
patch
'
).
and
.
callFake
((
url
,
data
)
=>
{
spyOn
(
axios
,
'
patch
'
).
and
.
callFake
((
url
,
data
)
=>
{
expect
(
data
.
issue
.
assignee_ids
).
toEqual
([
0
]);
expect
(
data
.
issue
.
assignee_ids
).
toEqual
([
0
]);
done
();
done
();
return
Promise
.
resolve
();
return
Promise
.
resolve
();
...
...
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