Merge branch 'enable-ci_variables_api_filter_environment_scope-by-default' into 'master'

Enable FF ci_variables_api_filter_environment_scope by default

See merge request gitlab-org/gitlab!39209

changelogs/unreleased/enable-ci_variables_api_filter_environment_scope-by-default.yml

+---
+title: Enable FF ci_variables_api_filter_environment_scope by default
+merge_request: 39209
+author:
+type: changed

doc/api/project_level_variables.md

@@ -155,8 +155,10 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://git
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34490) in GitLab 13.2.
 > - It's deployed behind a feature flag, disabled by default.
-> - It's disabled on GitLab.com.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to enable it.
+> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39209) on GitLab 13.3.
+> - It's enabled on GitLab.com.
+> - It's recommended for production use.
+> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable).
 
 This parameter is used for filtering by attributes, such as `environment_scope`.
 
@@ -168,17 +170,18 @@ curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://git
 
 ### Enable or disable
 
+It is deployed behind a feature flag that is **enabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../administration/feature_flags.md)
-can enable it for your instance.
+can opt to disable it for your instance.
 
-To enable it:
+To disable it:
 
 ```ruby
-Feature.enable(:ci_variables_api_filter_environment_scope)
+Feature.disable(:ci_variables_api_filter_environment_scope)
 ```
 
-To disable it:
+To enable it:
 
 ```ruby
-Feature.disable(:ci_variables_api_filter_environment_scope)
+Feature.enable(:ci_variables_api_filter_environment_scope)
 ```

lib/gitlab/ci/features.rb

@@ -41,7 +41,7 @@ module Gitlab
 
       # Remove in https://gitlab.com/gitlab-org/gitlab/-/issues/227052
       def self.variables_api_filter_environment_scope?
-        ::Feature.enabled?(:ci_variables_api_filter_environment_scope, default_enabled: false)
+        ::Feature.enabled?(:ci_variables_api_filter_environment_scope, default_enabled: true)
       end
 
       def self.raise_job_rules_without_workflow_rules_warning?