diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-03 06:11:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-03 06:11:54 +0300 |
commit | 6577e5711222dc3b4199588a541f738b22380eb6 (patch) | |
tree | dbca81fd2f22acf4ddbaa57fafcb2f570d573b3d /app/assets/javascripts/vue_shared | |
parent | 3dbedd8bf66fd4af6bc5448b8ae27c01da058f43 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/ci_badge_link.vue | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue index 036c03a9a1e..3cd00972e17 100644 --- a/app/assets/javascripts/vue_shared/components/ci_badge_link.vue +++ b/app/assets/javascripts/vue_shared/components/ci_badge_link.vue @@ -57,17 +57,27 @@ export default { return badgeSizeOptions[value] !== undefined; }, }, + showTooltip: { + type: Boolean, + required: false, + default: true, + }, + useLink: { + type: Boolean, + default: true, + required: false, + }, }, computed: { isNotLargeBadgeSize() { - return this.badgeSize !== badgeSizeOptions.lg; + return this.size !== badgeSizeOptions.lg; }, title() { - return !this.showText ? this.status?.text : ''; + return this.showTooltip && !this.showText ? this.status?.text : ''; }, detailsPath() { // For now, this can either come from graphQL with camelCase or REST API in snake_case - return this.status.detailsPath || this.status.details_path; + return this.useLink && (this.status.detailsPath || this.status.details_path); }, badgeStyles() { switch (this.status.icon) { |