Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
		
						commit
						8451e08aaa
					
				
					 5 changed files with 7 additions and 9 deletions
				
			
		
							
								
								
									
										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 | ||||
| on: | ||||
|   pull_request: | ||||
|     types: [opened, reopened, synchronize] | ||||
|   repository_dispatch: | ||||
|     types: [deploy-command] | ||||
| 
 | ||||
|  | @ -12,7 +10,6 @@ jobs: | |||
|   deploy-preview-environment: | ||||
|     runs-on: ubuntu-latest | ||||
|     if: | ||||
|       github.event_name == 'repository_dispatch' && | ||||
|       github.event.client_payload.slash_command.sha != '' && | ||||
|       contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha) | ||||
|     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: | ||||
|   destroy-preview-environment: | ||||
|     runs-on: ubuntu-latest | ||||
|     if: github.repository == github.event.pull_request.head.repo.full_name | ||||
|     steps: | ||||
|       - name: Context | ||||
|         uses: okteto/context@latest | ||||
|  |  | |||
|  | @ -29,8 +29,8 @@ describe('After user signed in', () => { | |||
| 
 | ||||
| 	it('first widget should be removed', () => { | ||||
| 		cy.get('.mk-widget-edit').click(); | ||||
| 		cy.get('.customize-container:first-child .remove._button').click(); | ||||
| 		cy.get('.customize-container').should('have.length', 2); | ||||
| 		cy.get('.data-cy-customize-container:first-child .data-cy-customize-container-remove._button').click(); | ||||
| 		cy.get('.data-cy-customize-container').should('have.length', 2); | ||||
| 	}); | ||||
| 
 | ||||
| 	function buildWidgetTest(widgetName) { | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| { | ||||
| 	"name": "misskey", | ||||
| 	"version": "13.0.0-rc.3", | ||||
| 	"version": "13.0.0-rc.4", | ||||
| 	"codename": "indigo", | ||||
| 	"repository": { | ||||
| 		"type": "git", | ||||
|  |  | |||
|  | @ -19,9 +19,9 @@ | |||
| 			@update:model-value="v => emit('updateWidgets', v)" | ||||
| 		> | ||||
| 			<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-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"> | ||||
| 						<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> | ||||
|  | @ -171,7 +171,7 @@ function onContextmenu(widget: Widget, ev: MouseEvent) { | |||
| 
 | ||||
| 		&-widget { | ||||
| 			pointer-events: none; | ||||
| 		}  | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue