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
1c463586
Commit
1c463586
authored
May 18, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed un-used CSS
Fixed random if statement [ci skip]
parent
c225007a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
app/assets/javascripts/issue_show/components/app.vue
app/assets/javascripts/issue_show/components/app.vue
+3
-2
app/assets/javascripts/issue_show/components/fields/project_move.vue
...javascripts/issue_show/components/fields/project_move.vue
+0
-1
spec/javascripts/issue_show/components/app_spec.js
spec/javascripts/issue_show/components/app_spec.js
+11
-2
No files found.
app/assets/javascripts/issue_show/components/app.vue
View file @
1c463586
...
...
@@ -8,6 +8,7 @@ import Store from '../stores';
import
titleComponent
from
'
./title.vue
'
;
import
descriptionComponent
from
'
./description.vue
'
;
import
formComponent
from
'
./form.vue
'
;
import
'
../../lib/utils/url_utility
'
;
export
default
{
props
:
{
...
...
@@ -106,8 +107,8 @@ export default {
.
then
((
data
)
=>
{
if
(
location
.
pathname
!==
data
.
path
)
{
gl
.
utils
.
visitUrl
(
data
.
path
);
}
if
(
data
.
confidential
!==
this
.
isConfidential
)
{
gl
.
utils
.
visitUrl
(
location
.
href
);
}
else
if
(
data
.
confidential
!==
this
.
isConfidential
)
{
gl
.
utils
.
visitUrl
(
location
.
pathname
);
}
eventHub
.
$emit
(
'
close.form
'
);
...
...
app/assets/javascripts/issue_show/components/fields/project_move.vue
View file @
1c463586
...
...
@@ -72,7 +72,6 @@
</div>
<span
data-placement=
"auto top"
style=
"cursor: default"
title=
"Moving an issue will copy the discussion to a different project and close it here. All participants will be notified of the new location."
ref=
"tooltip"
>
<i
...
...
spec/javascripts/issue_show/components/app_spec.js
View file @
1c463586
...
...
@@ -116,6 +116,7 @@ describe('Issuable output', () => {
json
()
{
return
{
confidential
:
true
,
path
:
location
.
pathname
,
};
},
});
...
...
@@ -126,7 +127,7 @@ describe('Issuable output', () => {
setTimeout
(()
=>
{
expect
(
gl
.
utils
.
visitUrl
,
).
toHaveBeenCalledWith
(
location
.
href
);
).
toHaveBeenCalledWith
(
location
.
pathname
);
done
();
});
...
...
@@ -154,7 +155,14 @@ describe('Issuable output', () => {
it
(
'
does not redirect if issue has not moved
'
,
(
done
)
=>
{
spyOn
(
gl
.
utils
,
'
visitUrl
'
);
spyOn
(
vm
.
service
,
'
updateIssuable
'
).
and
.
callFake
(()
=>
new
Promise
((
resolve
)
=>
{
resolve
();
resolve
({
json
()
{
return
{
path
:
location
.
pathname
,
confidential
:
vm
.
isConfidential
,
};
},
});
}));
vm
.
updateIssuable
();
...
...
@@ -175,6 +183,7 @@ describe('Issuable output', () => {
json
()
{
return
{
path
:
'
/testing-issue-move
'
,
confidential
:
vm
.
isConfidential
,
};
},
});
...
...
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