mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Merge branch 'master' into 1257-feature-fake-email-server
This commit is contained in:
commit
c2ae50deaa
1
.github/workflows/test.yml
vendored
1
.github/workflows/test.yml
vendored
@ -139,7 +139,6 @@ jobs:
|
|||||||
build_test_nginx:
|
build_test_nginx:
|
||||||
name: Docker Build Test - Nginx
|
name: Docker Build Test - Nginx
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [build_test_backend, build_test_admin, build_test_frontend]
|
|
||||||
steps:
|
steps:
|
||||||
##########################################################################
|
##########################################################################
|
||||||
# CHECKOUT CODE ##########################################################
|
# CHECKOUT CODE ##########################################################
|
||||||
|
|||||||
@ -65,7 +65,6 @@ export default {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
.then((result) => {
|
.then((result) => {
|
||||||
this.toastSuccess(this.$t('user_recovered'))
|
|
||||||
this.$emit('updateDeletedAt', {
|
this.$emit('updateDeletedAt', {
|
||||||
userId: this.item.userId,
|
userId: this.item.userId,
|
||||||
deletedAt: result.data.unDeleteUser,
|
deletedAt: result.data.unDeleteUser,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user