diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-16 00:08:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-16 00:08:21 +0300 |
| commit | 95ab36cd97f9f527ad624f80c6830eca28eeb7bf (patch) | |
| tree | e9691cf3f4786201040268327a967b63b74ff0c0 /app/assets/javascripts/confidential_merge_request | |
| parent | 31a340adabe75f8b02cca462ab8aa857ff62f772 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/confidential_merge_request')
| -rw-r--r-- | app/assets/javascripts/confidential_merge_request/components/dropdown.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/confidential_merge_request/components/dropdown.vue b/app/assets/javascripts/confidential_merge_request/components/dropdown.vue index 444640980af..92a5423d5ea 100644 --- a/app/assets/javascripts/confidential_merge_request/components/dropdown.vue +++ b/app/assets/javascripts/confidential_merge_request/components/dropdown.vue @@ -39,7 +39,7 @@ export default { <template> <gl-dropdown toggle-class="d-flex align-items-center w-100" class="w-100"> - <template slot="button-content"> + <template #button-content> <span class="str-truncated-100 mr-2"> <icon name="lock" /> {{ dropdownText }} |