Commit 76b3e789 authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch 'usag-data-api-ff-type' into 'master'

Move usage_data_api ff to ops and fix the specs

See merge request gitlab-org/gitlab!57225
parents 3c90b746 00f8522a
...@@ -3,6 +3,6 @@ name: usage_data_api ...@@ -3,6 +3,6 @@ name: usage_data_api
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41301 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41301
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267114 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267114
milestone: '13.4' milestone: '13.4'
type: development type: ops
group: group::product analytics group: group::product intelligence
default_enabled: true default_enabled: true
...@@ -8,7 +8,7 @@ module API ...@@ -8,7 +8,7 @@ module API
namespace 'usage_data' do namespace 'usage_data' do
before do before do
not_found! unless Feature.enabled?(:usage_data_api, default_enabled: true) not_found! unless Feature.enabled?(:usage_data_api, default_enabled: :yaml, type: :ops)
forbidden!('Invalid CSRF token is provided') unless verified_request? forbidden!('Invalid CSRF token is provided') unless verified_request?
end end
......
...@@ -45,7 +45,7 @@ module Gitlab ...@@ -45,7 +45,7 @@ module Gitlab
# Initialize gon.features with any flags that should be # Initialize gon.features with any flags that should be
# made globally available to the frontend # made globally available to the frontend
push_frontend_feature_flag(:snippets_binary_blob, default_enabled: false) push_frontend_feature_flag(:snippets_binary_blob, default_enabled: false)
push_frontend_feature_flag(:usage_data_api, default_enabled: true) push_frontend_feature_flag(:usage_data_api, type: :ops, default_enabled: :yaml)
push_frontend_feature_flag(:security_auto_fix, default_enabled: false) push_frontend_feature_flag(:security_auto_fix, default_enabled: false)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment