diff --git a/ee/app/graphql/ee/resolvers/projects/user_contributed_projects_resolver.rb b/ee/app/graphql/ee/resolvers/projects/user_contributed_projects_resolver.rb index 62dedfef4ce7b8af88e149ad233e8f9d70314531..3886b2d23efd2df5dcd1402497a7f57d40577339 100644 --- a/ee/app/graphql/ee/resolvers/projects/user_contributed_projects_resolver.rb +++ b/ee/app/graphql/ee/resolvers/projects/user_contributed_projects_resolver.rb @@ -21,11 +21,7 @@ module UserContributedProjectsResolver override :finder_params def finder_params(args) - super.merge( - filter_expired_saml_session_projects: ::Feature.enabled?( - :filter_saml_enforced_resources_from_graphql, current_user - ) - ) + super.merge(filter_expired_saml_session_projects: true) end end end diff --git a/ee/app/graphql/ee/resolvers/projects_resolver.rb b/ee/app/graphql/ee/resolvers/projects_resolver.rb index 14d8a05e6da935f96e3f377bc73ac786e92f6875..c0a3bc5d777a4b0327d55a9ed58d65cf637a9597 100644 --- a/ee/app/graphql/ee/resolvers/projects_resolver.rb +++ b/ee/app/graphql/ee/resolvers/projects_resolver.rb @@ -32,11 +32,7 @@ module ProjectsResolver def finder_params(args) super(args) .merge(args.slice(:aimed_for_deletion, :include_hidden, :marked_for_deletion_on)) - .merge( - filter_expired_saml_session_projects: ::Feature.enabled?( - :filter_saml_enforced_resources_from_graphql, current_user - ) - ) + .merge(filter_expired_saml_session_projects: true) end end end diff --git a/ee/app/graphql/ee/resolvers/user_starred_projects_resolver.rb b/ee/app/graphql/ee/resolvers/user_starred_projects_resolver.rb index 4d1f7c2f9079b424721a7b41760faa84a2a9c1d2..f94344ddb81f146c412fe83e80b64220973b0fa0 100644 --- a/ee/app/graphql/ee/resolvers/user_starred_projects_resolver.rb +++ b/ee/app/graphql/ee/resolvers/user_starred_projects_resolver.rb @@ -20,11 +20,7 @@ module UserStarredProjectsResolver # rubocop:disable Gitlab/BoundedContexts -- n override :finder_params def finder_params(args) - super.merge( - filter_expired_saml_session_projects: ::Feature.enabled?( - :filter_saml_enforced_resources_from_graphql, current_user - ) - ) + super.merge(filter_expired_saml_session_projects: true) end end end diff --git a/ee/config/feature_flags/gitlab_com_derisk/filter_saml_enforced_resources_from_graphql.yml b/ee/config/feature_flags/gitlab_com_derisk/filter_saml_enforced_resources_from_graphql.yml deleted file mode 100644 index c58d026e9e873f20e29811214eaa19431ea1eeb0..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/gitlab_com_derisk/filter_saml_enforced_resources_from_graphql.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: filter_saml_enforced_resources_from_graphql -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/514406 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180998 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/517989 -milestone: '17.9' -group: group::organizations -type: gitlab_com_derisk -default_enabled: false