Commit 625d3442 authored by Phil Hughes's avatar Phil Hughes

renamed path to web_url in endpoint

parent f452cb77
...@@ -124,8 +124,8 @@ export default { ...@@ -124,8 +124,8 @@ export default {
this.service.updateIssuable(this.store.formState) this.service.updateIssuable(this.store.formState)
.then(res => res.json()) .then(res => res.json())
.then((data) => { .then((data) => {
if (location.pathname !== data.path) { if (location.pathname !== data.web_url) {
gl.utils.visitUrl(data.path); gl.utils.visitUrl(data.web_url);
} else if (data.confidential !== this.isConfidential) { } else if (data.confidential !== this.isConfidential) {
gl.utils.visitUrl(location.pathname); gl.utils.visitUrl(location.pathname);
} }
......
...@@ -10,7 +10,7 @@ class IssueEntity < IssuableEntity ...@@ -10,7 +10,7 @@ class IssueEntity < IssuableEntity
expose :milestone, using: API::Entities::Milestone expose :milestone, using: API::Entities::Milestone
expose :labels, using: LabelEntity expose :labels, using: LabelEntity
expose :path do |issue| expose :web_url do |issue|
namespace_project_issue_path(issue.project.namespace, issue.project, issue) namespace_project_issue_path(issue.project.namespace, issue.project, issue)
end end
end end
...@@ -116,7 +116,7 @@ describe('Issuable output', () => { ...@@ -116,7 +116,7 @@ describe('Issuable output', () => {
json() { json() {
return { return {
confidential: false, confidential: false,
path: location.pathname, web_url: location.pathname,
}; };
}, },
}); });
...@@ -140,7 +140,7 @@ describe('Issuable output', () => { ...@@ -140,7 +140,7 @@ describe('Issuable output', () => {
json() { json() {
return { return {
confidential: true, confidential: true,
path: location.pathname, web_url: location.pathname,
}; };
}, },
}); });
...@@ -182,7 +182,7 @@ describe('Issuable output', () => { ...@@ -182,7 +182,7 @@ describe('Issuable output', () => {
resolve({ resolve({
json() { json() {
return { return {
path: location.pathname, web_url: location.pathname,
confidential: vm.isConfidential, confidential: vm.isConfidential,
}; };
}, },
...@@ -206,7 +206,7 @@ describe('Issuable output', () => { ...@@ -206,7 +206,7 @@ describe('Issuable output', () => {
resolve({ resolve({
json() { json() {
return { return {
path: '/testing-issue-move', web_url: '/testing-issue-move',
confidential: vm.isConfidential, confidential: vm.isConfidential,
}; };
}, },
...@@ -251,7 +251,7 @@ describe('Issuable output', () => { ...@@ -251,7 +251,7 @@ describe('Issuable output', () => {
spyOn(vm.service, 'deleteIssuable').and.callFake(() => new Promise((resolve) => { spyOn(vm.service, 'deleteIssuable').and.callFake(() => new Promise((resolve) => {
resolve({ resolve({
json() { json() {
return { path: '/test' }; return { web_url: '/test' };
}, },
}); });
})); }));
...@@ -273,7 +273,7 @@ describe('Issuable output', () => { ...@@ -273,7 +273,7 @@ describe('Issuable output', () => {
spyOn(vm.service, 'deleteIssuable').and.callFake(() => new Promise((resolve) => { spyOn(vm.service, 'deleteIssuable').and.callFake(() => new Promise((resolve) => {
resolve({ resolve({
json() { json() {
return { path: '/test' }; return { web_url: '/test' };
}, },
}); });
})); }));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment