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
eefcb9ab
Commit
eefcb9ab
authored
Dec 20, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code improvements
parent
6205e9d5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
11 deletions
+13
-11
app/assets/javascripts/issuable/related_issues/components/issue_item.vue
...scripts/issuable/related_issues/components/issue_item.vue
+7
-0
app/assets/javascripts/issuable/related_issues/components/issue_token.vue
...cripts/issuable/related_issues/components/issue_token.vue
+1
-2
app/assets/javascripts/issuable/related_issues/mixins/related_issues_mixin.js
...ts/issuable/related_issues/mixins/related_issues_mixin.js
+0
-5
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-0
spec/javascripts/issuable/related_issues/components/related_issues_root_spec.js
...ble/related_issues/components/related_issues_root_spec.js
+2
-2
spec/javascripts/issuable/related_issues/stores/related_issues_store_spec.js
...suable/related_issues/stores/related_issues_store_spec.js
+2
-2
No files found.
app/assets/javascripts/issuable/related_issues/components/issue_item.vue
View file @
eefcb9ab
...
...
@@ -4,6 +4,13 @@ import relatedIssueMixin from '../mixins/related_issues_mixin';
export
default
{
name
:
'
IssueItem
'
,
mixins
:
[
relatedIssueMixin
],
props
:
{
canReorder
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
},
computed
:
{
stateTitle
()
{
return
this
.
isOpen
?
'
Open
'
:
'
Closed
'
;
...
...
app/assets/javascripts/issuable/related_issues/components/issue_token.vue
View file @
eefcb9ab
...
...
@@ -42,7 +42,6 @@ export default {
:class=
"
{
'issue-token-link': isCondensed,
'issue-main-info': !isCondensed,
'sortable-link': canReorder
}"
:href="computedPath"
:title="issueTitle"
...
...
@@ -89,7 +88,7 @@ export default {
v-tooltip
ref=
"removeButton"
type=
"button"
class=
"js-issue-token-remove-button
flex-right
"
class=
"js-issue-token-remove-button"
:class=
"
{
'issue-token-remove-button': isCondensed,
'btn btn-default': !isCondensed
...
...
app/assets/javascripts/issuable/related_issues/mixins/related_issues_mixin.js
View file @
eefcb9ab
...
...
@@ -41,11 +41,6 @@ const mixins = {
required
:
false
,
default
:
false
,
},
canReorder
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
},
directives
:
{
tooltip
,
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
eefcb9ab
...
...
@@ -664,6 +664,7 @@
padding-right
:
$gl-padding
;
.issue-main-info
{
flex
:
1
auto
;
margin-right
:
10px
;
min-width
:
0
;
}
...
...
spec/javascripts/issuable/related_issues/components/related_issues_root_spec.js
View file @
eefcb9ab
...
...
@@ -14,7 +14,7 @@ const issuable1 = {
title
:
'
issue1
'
,
path
:
'
/foo/bar/issues/123
'
,
state
:
'
opened
'
,
destroy_
relation_path
:
'
/foo/bar/issues/123/related_issues/1
'
,
relation_path
:
'
/foo/bar/issues/123/related_issues/1
'
,
};
const
issuable2
=
{
...
...
@@ -23,7 +23,7 @@ const issuable2 = {
title
:
'
issue1
'
,
path
:
'
/foo/bar/issues/124
'
,
state
:
'
opened
'
,
destroy_
relation_path
:
'
/foo/bar/issues/124/related_issues/1
'
,
relation_path
:
'
/foo/bar/issues/124/related_issues/1
'
,
};
describe
(
'
RelatedIssuesRoot
'
,
()
=>
{
...
...
spec/javascripts/issuable/related_issues/stores/related_issues_store_spec.js
View file @
eefcb9ab
...
...
@@ -6,7 +6,7 @@ const issuable1 = {
title
:
'
issue1
'
,
path
:
'
/foo/bar/issues/123
'
,
state
:
'
opened
'
,
destroy_
relation_path
:
'
/foo/bar/issues/123/related_issues/1
'
,
relation_path
:
'
/foo/bar/issues/123/related_issues/1
'
,
};
const
issuable2
=
{
...
...
@@ -15,7 +15,7 @@ const issuable2 = {
title
:
'
issue1
'
,
path
:
'
/foo/bar/issues/124
'
,
state
:
'
opened
'
,
destroy_
relation_path
:
'
/foo/bar/issues/124/related_issues/1
'
,
relation_path
:
'
/foo/bar/issues/124/related_issues/1
'
,
};
describe
(
'
RelatedIssuesStore
'
,
()
=>
{
...
...
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