Merge branch 'main' into rc

.github/ISSUE_TEMPLATE/config.yml

@@ -1,10 +1,7 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 🚀 Feature Request
-    url: https://github.com/zitadel/zitadel/discussions/categories/ideas
-    about: Tell us about your idea in the discussions
   - name: ❓ Questions
     url: https://github.com/zitadel/zitadel/discussions/categories/q-a
     about: Ask for help in our Q&A discussions
-  - name: 💬 ZITADEL Chat
+  - name: 💬 ZITADEL Community Chat
     url: https://zitadel.com/chat

.github/ISSUE_TEMPLATE/docs.yaml

@@ -1,6 +1,5 @@
 name: 📄 Documentation
 description: Create an issue for missing or wrong documentation.
-title: 
 labels: ["docs"]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/improvement.yaml

@@ -1,6 +1,5 @@
 name: 🛠️ Improvement
-description: 
+description: "Create an new issue for an improvment in ZITADEL"
-title: 
 labels: ["improvement"]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/proposal.yaml

@@ -1,6 +1,5 @@
 name: 💡 Proposal / Feature request
-description: 
+description: "Create an issue for a feature request/proposal."
-title: 
 labels: ["enhancement"]
 body:
   - type: markdown

internal/query/projection/idp_template.go

@@ -351,6 +351,10 @@ func (p *idpTemplateProjection) reducers() []handler.AggregateReducer {
 					Event:  instance.OIDCIDPMigratedAzureADEventType,
 					Reduce: p.reduceOIDCIDPMigratedAzureAD,
 				},
+				{
+					Event:  instance.OIDCIDPMigratedGoogleEventType,
+					Reduce: p.reduceOIDCIDPMigratedGoogle,
+				},
 				{
 					Event:  instance.JWTIDPAddedEventType,
 					Reduce: p.reduceJWTIDPAdded,
@@ -472,6 +476,14 @@ func (p *idpTemplateProjection) reducers() []handler.AggregateReducer {
 					Event:  org.OIDCIDPChangedEventType,
 					Reduce: p.reduceOIDCIDPChanged,
 				},
+				{
+					Event:  org.OIDCIDPMigratedAzureADEventType,
+					Reduce: p.reduceOIDCIDPMigratedAzureAD,
+				},
+				{
+					Event:  org.OIDCIDPMigratedGoogleEventType,
+					Reduce: p.reduceOIDCIDPMigratedGoogle,
+				},
 				{
 					Event:  org.JWTIDPAddedEventType,
 					Reduce: p.reduceJWTIDPAdded,

internal/repository/instance/idp.go

@@ -263,7 +263,7 @@ func NewOIDCIDPMigratedGoogleEvent(
 			eventstore.NewBaseEventForPush(
 				ctx,
 				aggregate,
-				OIDCIDPMigratedAzureADEventType,
+				OIDCIDPMigratedGoogleEventType,
 			),
 			id,
 			name,