yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 17:00:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into ui-improvement

Browse Source
This commit is contained in:
Nitin 2023-06-26 14:20:35 +05:30 committed by GitHub
commit a57671b3a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/ee/server/controllers/workflows/stages/index.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
const { ApplicationError } = require('@strapi/utils/lib/errors'); const { ApplicationError } = require('@strapi/utils').errors;
const { getService } = require('../../../utils'); const { getService } = require('../../../utils');
const { hasReviewWorkflow } = require('../../../utils/review-workflows'); const { hasReviewWorkflow } = require('../../../utils/review-workflows');
const { const {

2
packages/core/admin/ee/server/services/passport.js
View File

@ -3,7 +3,7 @@
// eslint-disable-next-line node/no-extraneous-require // eslint-disable-next-line node/no-extraneous-require
const { features } = require('@strapi/strapi/lib/utils/ee'); const { features } = require('@strapi/strapi/lib/utils/ee');
const { UnauthorizedError } = require('@strapi/utils/lib/errors'); const { UnauthorizedError } = require('@strapi/utils').errors;
const createLocalStrategy = require('../../../server/services/passport/local-strategy'); const createLocalStrategy = require('../../../server/services/passport/local-strategy');
const sso = require('./passport/sso'); const sso = require('./passport/sso');
const { isSsoLocked } = require('../utils/sso-lock'); const { isSsoLocked } = require('../utils/sso-lock');

2
packages/core/admin/server/services/permission/permissions-manager/sanitize.js
View File

@ -20,7 +20,7 @@ const {
} = require('lodash/fp'); } = require('lodash/fp');
const { contentTypes, traverseEntity, sanitize, pipeAsync, traverse } = require('@strapi/utils'); const { contentTypes, traverseEntity, sanitize, pipeAsync, traverse } = require('@strapi/utils');
const { removePassword } = require('@strapi/utils/lib/sanitize/visitors'); const { removePassword } = require('@strapi/utils').sanitize.visitors;
const { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user'); const { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user');
const { const {