Commit a2e54676 authored by Mark Florian's avatar Mark Florian

Merge branch 'gitlab-ui-integration-1379-button-safe-links' into 'master'

Upgrade @gitlab/ui to v29.23.0

See merge request gitlab-org/gitlab!60961
parents 6090dbef 658796f8
...@@ -140,6 +140,7 @@ export default { ...@@ -140,6 +140,7 @@ export default {
</div> </div>
<div class="gl-p-2"> <div class="gl-p-2">
<gl-button <gl-button
is-unsafe-link
:href="codeDownloadUrl" :href="codeDownloadUrl"
:title="$options.i18n.downloadButton" :title="$options.i18n.downloadButton"
icon="download" icon="download"
......
...@@ -40,6 +40,8 @@ describe('DastSiteValidationModal', () => { ...@@ -40,6 +40,8 @@ describe('DastSiteValidationModal', () => {
let wrapper; let wrapper;
let requestHandlers; let requestHandlers;
const pendingHandler = jest.fn(() => new Promise(() => {}));
const componentFactory = (mountFn = shallowMount) => ({ const componentFactory = (mountFn = shallowMount) => ({
mountOptions = {}, mountOptions = {},
handlers = {}, handlers = {},
...@@ -109,7 +111,11 @@ describe('DastSiteValidationModal', () => { ...@@ -109,7 +111,11 @@ describe('DastSiteValidationModal', () => {
describe('rendering', () => { describe('rendering', () => {
describe('loading', () => { describe('loading', () => {
beforeEach(() => { beforeEach(() => {
createFullComponent(); createFullComponent({
handlers: {
dastSiteTokenCreate: pendingHandler,
},
});
}); });
it('renders a skeleton loader, no alert and no form group while token is being created', () => { it('renders a skeleton loader, no alert and no form group while token is being created', () => {
......
...@@ -94,7 +94,10 @@ describe('Pipelines', () => { ...@@ -94,7 +94,10 @@ describe('Pipelines', () => {
beforeAll(() => { beforeAll(() => {
origWindowLocation = window.location; origWindowLocation = window.location;
delete window.location; delete window.location;
window.location = { search: '' }; window.location = {
search: '',
protocol: 'https:',
};
}); });
afterAll(() => { afterAll(() => {
......
...@@ -907,10 +907,10 @@ ...@@ -907,10 +907,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8" resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw== integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
"@gitlab/ui@29.21.0": "@gitlab/ui@29.23.0":
version "29.21.0" version "29.23.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.21.0.tgz#f91169d693bc92109deadc412cf6ed76a8ae07ad" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.23.0.tgz#cf0bf2ed85c679a618f0f78d7f5d4e4346663b55"
integrity sha512-fAqhQjLXsl6JRM56NewFqtYowzjvne7IsM6F+aD4C/9OF9u81bXfa5do1o5usl030Hz9e8+PTwkXWwLTe0Nz8w== integrity sha512-ELMHentJ9v5WXlAAuSr5s5kYu8KW710N4qCnzdt09g+McSsvXUhOx2ltM0d4rZe+TZwgwAUndwCUDP+dHqDtrA==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.3.0" "@gitlab/vue-toasted" "^1.3.0"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment