forked from mirror/misskey
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
commit
8451e08aaa
3
.github/workflows/pr-preview-deploy.yml
vendored
3
.github/workflows/pr-preview-deploy.yml
vendored
@ -1,7 +1,5 @@
|
|||||||
# Run secret-dependent integration tests only after /deploy approval
|
# Run secret-dependent integration tests only after /deploy approval
|
||||||
on:
|
on:
|
||||||
pull_request:
|
|
||||||
types: [opened, reopened, synchronize]
|
|
||||||
repository_dispatch:
|
repository_dispatch:
|
||||||
types: [deploy-command]
|
types: [deploy-command]
|
||||||
|
|
||||||
@ -12,7 +10,6 @@ jobs:
|
|||||||
deploy-preview-environment:
|
deploy-preview-environment:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if:
|
if:
|
||||||
github.event_name == 'repository_dispatch' &&
|
|
||||||
github.event.client_payload.slash_command.sha != '' &&
|
github.event.client_payload.slash_command.sha != '' &&
|
||||||
contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha)
|
contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha)
|
||||||
steps:
|
steps:
|
||||||
|
1
.github/workflows/pr-preview-destroy.yml
vendored
1
.github/workflows/pr-preview-destroy.yml
vendored
@ -9,6 +9,7 @@ name: Destroy preview environment
|
|||||||
jobs:
|
jobs:
|
||||||
destroy-preview-environment:
|
destroy-preview-environment:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
if: github.repository == github.event.pull_request.head.repo.full_name
|
||||||
steps:
|
steps:
|
||||||
- name: Context
|
- name: Context
|
||||||
uses: okteto/context@latest
|
uses: okteto/context@latest
|
||||||
|
@ -29,8 +29,8 @@ describe('After user signed in', () => {
|
|||||||
|
|
||||||
it('first widget should be removed', () => {
|
it('first widget should be removed', () => {
|
||||||
cy.get('.mk-widget-edit').click();
|
cy.get('.mk-widget-edit').click();
|
||||||
cy.get('.customize-container:first-child .remove._button').click();
|
cy.get('.data-cy-customize-container:first-child .data-cy-customize-container-remove._button').click();
|
||||||
cy.get('.customize-container').should('have.length', 2);
|
cy.get('.data-cy-customize-container').should('have.length', 2);
|
||||||
});
|
});
|
||||||
|
|
||||||
function buildWidgetTest(widgetName) {
|
function buildWidgetTest(widgetName) {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"version": "13.0.0-rc.3",
|
"version": "13.0.0-rc.4",
|
||||||
"codename": "indigo",
|
"codename": "indigo",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -19,9 +19,9 @@
|
|||||||
@update:model-value="v => emit('updateWidgets', v)"
|
@update:model-value="v => emit('updateWidgets', v)"
|
||||||
>
|
>
|
||||||
<template #item="{element}">
|
<template #item="{element}">
|
||||||
<div :class="[$style.widget, $style['customize-container']]">
|
<div :class="[$style.widget, $style['customize-container']]" class="data-cy-customize-container">
|
||||||
<button :class="$style['customize-container-config']" class="_button" @click.prevent.stop="configWidget(element.id)"><i class="ti ti-settings"></i></button>
|
<button :class="$style['customize-container-config']" class="_button" @click.prevent.stop="configWidget(element.id)"><i class="ti ti-settings"></i></button>
|
||||||
<button :class="$style['customize-container-remove']" class="_button" @click.prevent.stop="removeWidget(element)"><i class="ti ti-x"></i></button>
|
<button :class="$style['customize-container-remove']" class="_button data-cy-customize-container-remove" @click.prevent.stop="removeWidget(element)"><i class="ti ti-x"></i></button>
|
||||||
<div class="handle">
|
<div class="handle">
|
||||||
<component :is="`widget-${element.name}`" :ref="el => widgetRefs[element.id] = el" class="widget" :class="$style['customize-container-handle-widget']" :widget="element" @update-props="updateWidget(element.id, $event)"/>
|
<component :is="`widget-${element.name}`" :ref="el => widgetRefs[element.id] = el" class="widget" :class="$style['customize-container-handle-widget']" :widget="element" @update-props="updateWidget(element.id, $event)"/>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user