diff --git a/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs index 0f1d67be5..43b9f750d 100644 --- a/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs +++ b/ui/admin/app/components/auth-methods/auth-method/actions/index.hbs @@ -65,16 +65,14 @@ {{/if}} - {{#if (feature-flag 'managed-groups')}} - {{#if (can 'create model' @model collection='managed-groups')}} - {{#if @model.isOIDC}} - - {{t 'resources.managed-group.actions.create'}} - - {{/if}} + {{#if (can 'create model' @model collection='managed-groups')}} + {{#if @model.isOIDC}} + + {{t 'resources.managed-group.actions.create'}} + {{/if}} {{/if}} diff --git a/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs b/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs index 2b6dce5aa..16b1d7aee 100644 --- a/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs +++ b/ui/admin/app/components/auth-methods/auth-method/nav/index.hbs @@ -9,13 +9,11 @@ {{/if}} - {{#if (feature-flag 'managed-groups')}} - {{#if (can 'navigate model' @model collection='managed-groups')}} - {{#if @model.isOIDC}} - - {{t 'resources.managed-group.title_plural'}} - - {{/if}} + {{#if (can 'navigate model' @model collection='managed-groups')}} + {{#if @model.isOIDC}} + + {{t 'resources.managed-group.title_plural'}} + {{/if}} {{/if}} \ No newline at end of file diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index 997536004..fe353435f 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -10,7 +10,6 @@ const featureEditions = { 'oidc-account-crud': true, search: false, filter: true, - 'managed-groups': true, 'static-credentials': false, byow: false, },