External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 11:25:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into feature_constructed-inventory

Browse Source
This commit is contained in:
Hao Liu
2023-02-15 10:05:02 -05:00
parent 1f2a5cf7e4 05af2972bf
commit 3335afcd3a
16 changed files with 2381 additions and 1902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3826
awx/ui/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
awx/ui/package.json
View File

@@ -42,7 +42,7 @@
"@babel/preset-react": "7.16.7",
"@cypress/instrument-cra": "^1.4.0",
"@lingui/cli": "^3.7.1",
"@lingui/loader": "^3.8.3",
"@lingui/loader": "3.15.0",
"@lingui/macro": "^3.7.1",
"@nteract/mockument": "^1.0.4",
"@testing-library/jest-dom": "^5.16.2",
@@ -66,7 +66,7 @@
"jest-websocket-mock": "^2.0.2",
"mock-socket": "^9.1.3",
"prettier": "2.3.2",
"react-scripts": "5.0.0"
"react-scripts": "5.0.1"
},
"scripts": {
"prelint": "lingui compile",

4
awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
View File

@@ -868,7 +868,7 @@
"type": "boolean",
"required": false,
"label": "Verify OIDC Provider Certificate",
"help_text": "Verify the OIDV provider ssl certificate.",
"help_text": "Verify the OIDC provider ssl certificate.",
"category": "Generic OIDC",
"category_slug": "oidc",
"default": true
@@ -4545,7 +4545,7 @@
"SOCIAL_AUTH_OIDC_VERIFY_SSL": {
"type": "boolean",
"label": "Verify OIDC Provider Certificate",
"help_text": "Verify the OIDV provider ssl certificate.",
"help_text": "Verify the OIDC provider ssl certificate.",
"category": "Generic OIDC",
"category_slug": "oidc",
"default": true