diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 12:09:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 12:09:29 +0300 |
commit | 3fd97b4bba24ca412112aad025a38a32c7a6cf8c (patch) | |
tree | 4aacc8a184522bcbc3db68df47620bc3d2cfcfd9 /app/assets/javascripts/related_merge_requests | |
parent | c52239391bf29f640e1e0af98edbd337c0293940 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/related_merge_requests')
-rw-r--r-- | app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue b/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue index dc7c9d9f174..05803ba09ab 100644 --- a/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue +++ b/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue @@ -1,6 +1,6 @@ <script> import { mapState, mapActions } from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; +import { GlLink, GlLoadingIcon } from '@gitlab/ui'; import { sprintf, n__, s__ } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue'; @@ -10,6 +10,7 @@ export default { name: 'RelatedMergeRequests', components: { Icon, + GlLink, GlLoadingIcon, RelatedIssuableItem, }, @@ -64,10 +65,19 @@ export default { </script> <template> - <div v-if="isFetchingMergeRequests || (!isFetchingMergeRequests && totalCount)"> + <div + v-if="isFetchingMergeRequests || (!isFetchingMergeRequests && totalCount)" + id="related-merge-requests" + > <div id="merge-requests" class="card card-slim mt-3"> <div class="card-header"> - <div class="card-title mt-0 mb-0 h5 merge-requests-title"> + <div class="card-title mt-0 mb-0 h5 merge-requests-title position-relative"> + <gl-link + id="user-content-related-merge-requests" + class="anchor position-absolute text-decoration-none" + href="#related-merge-requests" + aria-hidden="true" + /> <span class="mr-1"> {{ __('Related merge requests') }} </span> |