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
9ef0f7eb
Commit
9ef0f7eb
authored
Feb 02, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed approvals MR widget component
parent
ffc63066
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue
.../vue_merge_request_widget/components/mr_widget_author.vue
+16
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js
...rge_request_widget/components/approvals/approvals_body.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue
View file @
9ef0f7eb
...
...
@@ -6,6 +6,16 @@
type
:
Object
,
required
:
true
,
},
showAuthorName
:
{
type
:
Boolean
,
required
:
false
,
default
:
true
,
},
showAuthorTooltip
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
},
computed
:
{
authorUrl
()
{
...
...
@@ -21,12 +31,17 @@
<a
:href=
"authorUrl"
class=
"author-link inline"
:v-tooltip=
"showAuthorTooltip"
:title=
"author.name"
>
<img
:src=
"avatarUrl"
class=
"avatar avatar-inline s16"
/>
<span
class=
"author"
>
<span
class=
"author"
v-if=
"showAuthorName"
>
{{
author
.
name
}}
</span>
</a>
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_body.js
View file @
9ef0f7eb
import
Flash
from
'
~/flash
'
;
import
MRWidgetAuthor
from
'
~/vue_merge_request_widget/components/mr_widget_author
'
;
import
MRWidgetAuthor
from
'
~/vue_merge_request_widget/components/mr_widget_author
.vue
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
export
default
{
...
...
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