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
Boxiang Sun
gitlab-ce
Commits
514826f5
Commit
514826f5
authored
Jan 31, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken test
parent
d700659b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
...rge_request_widget/components/mr_widget_related_links.vue
+2
-1
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
...javascripts/vue_merge_request_widget/mr_widget_options.js
+1
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
View file @
514826f5
...
...
@@ -7,6 +7,7 @@
relatedLinks
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
state
:
{
type
:
String
,
...
...
@@ -33,7 +34,7 @@
{{
closesText
}}
<span
v-html=
"relatedLinks.closing"
></span>
</p>
<p
v-if=
"relatedLinks.mentioned"
>
Mentions
<span
v-html=
"relatedLinks.mentioned"
></span>
{{
s__
(
"
mrWidget|Mentions
"
)
}}
<span
v-html=
"relatedLinks.mentioned"
></span>
</p>
<p
v-if=
"relatedLinks.assignToMe"
>
<span
v-html=
"relatedLinks.assignToMe"
></span>
...
...
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @
514826f5
...
...
@@ -63,8 +63,7 @@ export default {
return
this
.
mr
.
hasCI
;
},
shouldRenderRelatedLinks
()
{
const
{
closing
,
mentioned
,
assignToMe
}
=
this
.
mr
.
relatedLinks
;
return
(
closing
||
mentioned
||
assignToMe
)
&&
!
this
.
mr
.
isNothingToMergeState
;
return
!!
this
.
mr
.
relatedLinks
&&
!
this
.
mr
.
isNothingToMergeState
;
},
shouldRenderDeployments
()
{
return
this
.
mr
.
deployments
.
length
;
...
...
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