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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
625d3442
Commit
625d3442
authored
May 25, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renamed path to web_url in endpoint
parent
f452cb77
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/issue_show/components/app.vue
app/assets/javascripts/issue_show/components/app.vue
+2
-2
app/serializers/issue_entity.rb
app/serializers/issue_entity.rb
+1
-1
spec/javascripts/issue_show/components/app_spec.js
spec/javascripts/issue_show/components/app_spec.js
+6
-6
No files found.
app/assets/javascripts/issue_show/components/app.vue
View file @
625d3442
...
...
@@ -124,8 +124,8 @@ export default {
this
.
service
.
updateIssuable
(
this
.
store
.
formState
)
.
then
(
res
=>
res
.
json
())
.
then
((
data
)
=>
{
if
(
location
.
pathname
!==
data
.
path
)
{
gl
.
utils
.
visitUrl
(
data
.
path
);
if
(
location
.
pathname
!==
data
.
web_url
)
{
gl
.
utils
.
visitUrl
(
data
.
web_url
);
}
else
if
(
data
.
confidential
!==
this
.
isConfidential
)
{
gl
.
utils
.
visitUrl
(
location
.
pathname
);
}
...
...
app/serializers/issue_entity.rb
View file @
625d3442
...
...
@@ -10,7 +10,7 @@ class IssueEntity < IssuableEntity
expose
:milestone
,
using:
API
::
Entities
::
Milestone
expose
:labels
,
using:
LabelEntity
expose
:
path
do
|
issue
|
expose
:
web_url
do
|
issue
|
namespace_project_issue_path
(
issue
.
project
.
namespace
,
issue
.
project
,
issue
)
end
end
spec/javascripts/issue_show/components/app_spec.js
View file @
625d3442
...
...
@@ -116,7 +116,7 @@ describe('Issuable output', () => {
json
()
{
return
{
confidential
:
false
,
path
:
location
.
pathname
,
web_url
:
location
.
pathname
,
};
},
});
...
...
@@ -140,7 +140,7 @@ describe('Issuable output', () => {
json
()
{
return
{
confidential
:
true
,
path
:
location
.
pathname
,
web_url
:
location
.
pathname
,
};
},
});
...
...
@@ -182,7 +182,7 @@ describe('Issuable output', () => {
resolve
({
json
()
{
return
{
path
:
location
.
pathname
,
web_url
:
location
.
pathname
,
confidential
:
vm
.
isConfidential
,
};
},
...
...
@@ -206,7 +206,7 @@ describe('Issuable output', () => {
resolve
({
json
()
{
return
{
path
:
'
/testing-issue-move
'
,
web_url
:
'
/testing-issue-move
'
,
confidential
:
vm
.
isConfidential
,
};
},
...
...
@@ -251,7 +251,7 @@ describe('Issuable output', () => {
spyOn
(
vm
.
service
,
'
deleteIssuable
'
).
and
.
callFake
(()
=>
new
Promise
((
resolve
)
=>
{
resolve
({
json
()
{
return
{
path
:
'
/test
'
};
return
{
web_url
:
'
/test
'
};
},
});
}));
...
...
@@ -273,7 +273,7 @@ describe('Issuable output', () => {
spyOn
(
vm
.
service
,
'
deleteIssuable
'
).
and
.
callFake
(()
=>
new
Promise
((
resolve
)
=>
{
resolve
({
json
()
{
return
{
path
:
'
/test
'
};
return
{
web_url
:
'
/test
'
};
},
});
}));
...
...
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