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
293d7566
Commit
293d7566
authored
Jul 23, 2020
by
Scott Stern
Committed by
Miguel Rincon
Jul 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issuable_list_spec by removing FF for vue_issuables_list
parent
6c597b13
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
app/assets/javascripts/issuables_list/components/issuable.vue
...assets/javascripts/issuables_list/components/issuable.vue
+6
-5
spec/features/issuables/issuable_list_spec.rb
spec/features/issuables/issuable_list_spec.rb
+0
-2
No files found.
app/assets/javascripts/issuables_list/components/issuable.vue
View file @
293d7566
...
@@ -153,6 +153,7 @@ export default {
...
@@ -153,6 +153,7 @@ export default {
value
:
this
.
issuable
.
merge_requests_count
,
value
:
this
.
issuable
.
merge_requests_count
,
title
:
__
(
'
Related merge requests
'
),
title
:
__
(
'
Related merge requests
'
),
dataTestId
:
'
merge-requests
'
,
dataTestId
:
'
merge-requests
'
,
class
:
'
js-merge-requests icon-merge-request-unmerged
'
,
icon
:
'
merge-request
'
,
icon
:
'
merge-request
'
,
},
},
{
{
...
@@ -161,6 +162,7 @@ export default {
...
@@ -161,6 +162,7 @@ export default {
value
:
this
.
issuable
.
upvotes
,
value
:
this
.
issuable
.
upvotes
,
title
:
__
(
'
Upvotes
'
),
title
:
__
(
'
Upvotes
'
),
dataTestId
:
'
upvotes
'
,
dataTestId
:
'
upvotes
'
,
class
:
'
js-upvotes issuable-upvotes
'
,
icon
:
'
thumb-up
'
,
icon
:
'
thumb-up
'
,
},
},
{
{
...
@@ -169,6 +171,7 @@ export default {
...
@@ -169,6 +171,7 @@ export default {
value
:
this
.
issuable
.
downvotes
,
value
:
this
.
issuable
.
downvotes
,
title
:
__
(
'
Downvotes
'
),
title
:
__
(
'
Downvotes
'
),
dataTestId
:
'
downvotes
'
,
dataTestId
:
'
downvotes
'
,
class
:
'
js-downvotes issuable-downvotes
'
,
icon
:
'
thumb-down
'
,
icon
:
'
thumb-down
'
,
},
},
{
{
...
@@ -187,7 +190,7 @@ export default {
...
@@ -187,7 +190,7 @@ export default {
title
:
__
(
'
Comments
'
),
title
:
__
(
'
Comments
'
),
dataTestId
:
'
notes-count
'
,
dataTestId
:
'
notes-count
'
,
href
:
`
${
this
.
issuable
.
web_url
}
#notes`
,
href
:
`
${
this
.
issuable
.
web_url
}
#notes`
,
class
:
!
this
.
issuable
.
user_notes_count
?
'
no-comments
'
:
''
,
class
:
{
'
no-comments
'
:
!
this
.
issuable
.
user_notes_count
,
'
issuable-comments
'
:
true
}
,
icon
:
'
comments
'
,
icon
:
'
comments
'
,
},
},
];
];
...
@@ -274,9 +277,8 @@ export default {
...
@@ -274,9 +277,8 @@ export default {
<span
<span
v-if=
"issuable.has_tasks"
v-if=
"issuable.has_tasks"
class=
"gl-ml-2 task-status gl-display-none d-sm-inline-block"
class=
"gl-ml-2 task-status gl-display-none d-sm-inline-block"
>
{{
issuable
.
task_status
}}
</span
>
>
{{
issuable
.
task_status
}}
</span>
</div>
</div>
<div
class=
"issuable-info"
>
<div
class=
"issuable-info"
>
...
@@ -304,9 +306,8 @@ export default {
...
@@ -304,9 +306,8 @@ export default {
v-bind=
"popoverDataAttrs"
v-bind=
"popoverDataAttrs"
:href=
"issuableAuthor.web_url"
:href=
"issuableAuthor.web_url"
:target=
"linkTarget"
:target=
"linkTarget"
>
{{
issuableAuthor
.
name
}}
</gl-link
>
>
{{
issuableAuthor
.
name
}}
</gl-link>
</
template
>
</
template
>
</gl-sprintf>
</gl-sprintf>
</span>
</span>
...
...
spec/features/issuables/issuable_list_spec.rb
View file @
293d7566
...
@@ -9,8 +9,6 @@ RSpec.describe 'issuable list', :js do
...
@@ -9,8 +9,6 @@ RSpec.describe 'issuable list', :js do
issuable_types
=
[
:issue
,
:merge_request
]
issuable_types
=
[
:issue
,
:merge_request
]
before
do
before
do
stub_feature_flags
(
vue_issuables_list:
false
)
# something is going on
project
.
add_user
(
user
,
:developer
)
project
.
add_user
(
user
,
:developer
)
sign_in
(
user
)
sign_in
(
user
)
issuable_types
.
each
{
|
type
|
create_issuables
(
type
)
}
issuable_types
.
each
{
|
type
|
create_issuables
(
type
)
}
...
...
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