BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
0c4c8054
Commit
0c4c8054
authored
Mar 09, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refactor/move-assignee-title-vue-component' into 'master'
Move AssigneeTitle vue component See merge request gitlab-org/gitlab-ce!17397
parents
c591cf53
b3152bf2
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
9 deletions
+19
-9
board_sidebar.js
app/assets/javascripts/boards/components/board_sidebar.js
+1
-1
assignee_title.vue
...vascripts/sidebar/components/assignees/assignee_title.vue
+11
-6
sidebar_assignees.vue
...cripts/sidebar/components/assignees/sidebar_assignees.vue
+1
-1
refactor-move-assignee-title-vue-component.yml
...unreleased/refactor-move-assignee-title-vue-component.yml
+5
-0
assignee_title_spec.js
spec/javascripts/sidebar/assignee_title_spec.js
+1
-1
No files found.
app/assets/javascripts/boards/components/board_sidebar.js
View file @
0c4c8054
...
@@ -5,7 +5,7 @@ import Flash from '../../flash';
...
@@ -5,7 +5,7 @@ import Flash from '../../flash';
import
{
__
}
from
'../../locale'
;
import
{
__
}
from
'../../locale'
;
import
Sidebar
from
'../../right_sidebar'
;
import
Sidebar
from
'../../right_sidebar'
;
import
eventHub
from
'../../sidebar/event_hub'
;
import
eventHub
from
'../../sidebar/event_hub'
;
import
assigneeTitle
from
'../../sidebar/components/assignees/assignee_title'
;
import
assigneeTitle
from
'../../sidebar/components/assignees/assignee_title
.vue
'
;
import
assignees
from
'../../sidebar/components/assignees/assignees.vue'
;
import
assignees
from
'../../sidebar/components/assignees/assignees.vue'
;
import
DueDateSelectors
from
'../../due_date_select'
;
import
DueDateSelectors
from
'../../due_date_select'
;
import
'./sidebar/remove_issue'
;
import
'./sidebar/remove_issue'
;
...
...
app/assets/javascripts/sidebar/components/assignees/assignee_title.
js
→
app/assets/javascripts/sidebar/components/assignees/assignee_title.
vue
View file @
0c4c8054
<
script
>
export
default
{
export
default
{
name
:
'AssigneeTitle'
,
name
:
'AssigneeTitle'
,
props
:
{
props
:
{
...
@@ -26,14 +27,18 @@ export default {
...
@@ -26,14 +27,18 @@ export default {
return
assignees
>
1
?
`
${
assignees
}
Assignees`
:
'Assignee'
;
return
assignees
>
1
?
`
${
assignees
}
Assignees`
:
'Assignee'
;
},
},
},
},
template
:
`
};
</
script
>
<
template
>
<div
class=
"title hide-collapsed"
>
<div
class=
"title hide-collapsed"
>
{{assigneeTitle
}}
{{
assigneeTitle
}}
<i
<i
v-if=
"loading"
v-if=
"loading"
aria-hidden=
"true"
aria-hidden=
"true"
class=
"fa fa-spinner fa-spin block-loading"
class=
"fa fa-spinner fa-spin block-loading"
/>
>
</i>
<a
<a
v-if=
"editable"
v-if=
"editable"
class=
"js-sidebar-dropdown-toggle edit-link pull-right"
class=
"js-sidebar-dropdown-toggle edit-link pull-right"
...
@@ -52,8 +57,8 @@ export default {
...
@@ -52,8 +57,8 @@ export default {
aria-hidden=
"true"
aria-hidden=
"true"
data-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-angle-double-right"
class=
"fa fa-angle-double-right"
/>
>
</i>
</a>
</a>
</div>
</div>
`
,
</
template
>
};
app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue
View file @
0c4c8054
<
script
>
<
script
>
import
Flash
from
'../../../flash'
;
import
Flash
from
'../../../flash'
;
import
AssigneeTitle
from
'./assignee_title'
;
import
AssigneeTitle
from
'./assignee_title
.vue
'
;
import
Assignees
from
'./assignees.vue'
;
import
Assignees
from
'./assignees.vue'
;
import
Store
from
'../../stores/sidebar_store'
;
import
Store
from
'../../stores/sidebar_store'
;
import
eventHub
from
'../../event_hub'
;
import
eventHub
from
'../../event_hub'
;
...
...
changelogs/unreleased/refactor-move-assignee-title-vue-component.yml
0 → 100644
View file @
0c4c8054
---
title
:
Move AssigneeTitle vue component
merge_request
:
17397
author
:
George Tsiolis
type
:
performance
spec/javascripts/sidebar/assignee_title_spec.js
View file @
0c4c8054
import
Vue
from
'vue'
;
import
Vue
from
'vue'
;
import
AssigneeTitle
from
'~/sidebar/components/assignees/assignee_title'
;
import
AssigneeTitle
from
'~/sidebar/components/assignees/assignee_title
.vue
'
;
describe
(
'AssigneeTitle component'
,
()
=>
{
describe
(
'AssigneeTitle component'
,
()
=>
{
let
component
;
let
component
;
...
...
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