VladPolskiy/gitlabhq
1
0
Fork 0
mirror of https://github.com/gitlabhq/gitlabhq.git synced 2025-08-20 16:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@18-0-stable-ee

Browse Source
This commit is contained in:
GitLab Bot
2025-05-29 13:23:03 +00:00
parent a647b7117a
commit f33175a698
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/vue_shared/components/code_dropdown/code_dropdown.vue
View File

@ -61,22 +61,37 @@ export default {
Boolean(this.sshUrl) && { Boolean(this.sshUrl) && {
text: __('Visual Studio Code (SSH)'), text: __('Visual Studio Code (SSH)'),
href: `${this.$options.vsCodeBaseUrl}${this.sshUrlEncoded}`, href: `${this.$options.vsCodeBaseUrl}${this.sshUrlEncoded}`,
extraAttrs: {
isUnsafeLink: true,
},
}, },
Boolean(this.httpUrl) && { Boolean(this.httpUrl) && {
text: __('Visual Studio Code (HTTPS)'), text: __('Visual Studio Code (HTTPS)'),
href: `${this.$options.vsCodeBaseUrl}${this.httpUrlEncoded}`, href: `${this.$options.vsCodeBaseUrl}${this.httpUrlEncoded}`,
extraAttrs: {
isUnsafeLink: true,
},
}, },
Boolean(this.sshUrl) && { Boolean(this.sshUrl) && {
text: __('IntelliJ IDEA (SSH)'), text: __('IntelliJ IDEA (SSH)'),
href: `${this.$options.jetBrainsBaseUrl}${this.sshUrlEncoded}`, href: `${this.$options.jetBrainsBaseUrl}${this.sshUrlEncoded}`,
extraAttrs: {
isUnsafeLink: true,
},
}, },
Boolean(this.httpUrl) && { Boolean(this.httpUrl) && {
text: __('IntelliJ IDEA (HTTPS)'), text: __('IntelliJ IDEA (HTTPS)'),
href: `${this.$options.jetBrainsBaseUrl}${this.httpUrlEncoded}`, href: `${this.$options.jetBrainsBaseUrl}${this.httpUrlEncoded}`,
extraAttrs: {
isUnsafeLink: true,
},
}, },
Boolean(this.xcodeUrl) && { Boolean(this.xcodeUrl) && {
text: __('Xcode'), text: __('Xcode'),
href: this.xcodeUrl, href: this.xcodeUrl,
extraAttrs: {
isUnsafeLink: true,
},
}, },
].filter(Boolean); ].filter(Boolean);

1
spec/frontend/vue_shared/components/code_dropdown/code_dropdown_spec.js
View File

@ -127,6 +127,7 @@ describe('Code Dropdown component', () => {
expect(item.props('item').text).toBe(name); expect(item.props('item').text).toBe(name);
expect(item.props('item').href).toContain(href); expect(item.props('item').href).toContain(href);
expect(item.props('item').extraAttrs.isUnsafeLink).toBe(true);
}); });
it('closes the dropdown on click', () => { it('closes the dropdown on click', () => {