-
-
Notifications
You must be signed in to change notification settings - Fork 907
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into web/cleanup/admin-overview-testing
* main: (165 commits) web/flows: update flow background (#11044) web: bump API Client version (#11043) website/integrations: Correct Discord avatar code and add warning. (#11031) core, web: update translations (#11032) website: bump docusaurus-theme-openapi-docs from 4.0.0 to 4.0.1 in /website (#11034) core: bump ruff from 0.6.1 to 0.6.2 (#11035) core: bump goauthentik.io/api/v3 from 3.2024063.12 to 3.2024063.13 (#11036) web: bump the babel group across 1 directory with 3 updates (#11038) web: bump wireit from 0.14.7 to 0.14.8 in /web (#11039) web: bump @goauthentik/api from 2024.6.3-1723921843 to 2024.6.3-1724337552 in /web/sfe (#11040) enterprise: add up-to-date license status (#11042) website/docs: cve release notes (#11026) security: fix CVE-2024-42490 (#11022) web: bump API Client version (#11021) providers/scim: optimize sending all members within a group (#9968) providers/scim: add API endpoint to sync single user (#8486) web: bump chromedriver from 127.0.3 to 128.0.0 in /tests/wdio (#11017) web: dual-select uses, part 2: dual-select harder (#9377) web: fix flash of unstructured content, add tests for it (#11013) core: bump drf-orjson-renderer from 1.7.2 to 1.7.3 (#11015) ...
- Loading branch information
Showing
439 changed files
with
42,527 additions
and
20,068 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
authentik/core/migrations/0039_source_group_matching_mode_alter_group_name_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
# Generated by Django 5.0.7 on 2024-08-01 18:52 | ||
|
||
import django.db.models.deletion | ||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
("authentik_core", "0038_source_authentik_c_enabled_d72365_idx"), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name="source", | ||
name="group_matching_mode", | ||
field=models.TextField( | ||
choices=[ | ||
("identifier", "Use the source-specific identifier"), | ||
( | ||
"name_link", | ||
"Link to a group with identical name. Can have security implications when a group name is used with another source.", | ||
), | ||
( | ||
"name_deny", | ||
"Use the group name, but deny enrollment when the name already exists.", | ||
), | ||
], | ||
default="identifier", | ||
help_text="How the source determines if an existing group should be used or a new group created.", | ||
), | ||
), | ||
migrations.AlterField( | ||
model_name="group", | ||
name="name", | ||
field=models.TextField(verbose_name="name"), | ||
), | ||
migrations.CreateModel( | ||
name="GroupSourceConnection", | ||
fields=[ | ||
( | ||
"id", | ||
models.AutoField( | ||
auto_created=True, primary_key=True, serialize=False, verbose_name="ID" | ||
), | ||
), | ||
("created", models.DateTimeField(auto_now_add=True)), | ||
("last_updated", models.DateTimeField(auto_now=True)), | ||
("identifier", models.TextField()), | ||
( | ||
"group", | ||
models.ForeignKey( | ||
on_delete=django.db.models.deletion.CASCADE, to="authentik_core.group" | ||
), | ||
), | ||
( | ||
"source", | ||
models.ForeignKey( | ||
on_delete=django.db.models.deletion.CASCADE, to="authentik_core.source" | ||
), | ||
), | ||
], | ||
options={ | ||
"unique_together": {("group", "source")}, | ||
}, | ||
), | ||
] |
Oops, something went wrong.