Merge branch 'enable-group-ca-by-default' into 'master'

Make group_level_cycle_analytics enabled by default

See merge request gitlab-org/gitlab!27304

doc/user/analytics/value_stream_analytics.md

@@ -25,12 +25,7 @@ calculates a separate median for each stage.
 
 Value Stream Analytics is available:
 
-- From GitLab 12.3, at the group level in the analytics workspace (top navigation bar) at
-  **Analytics > Value Stream Analytics**. **(PREMIUM)**
-
-  In the future, multiple groups will be selectable which will effectively make this an
-  instance-level feature.
-
+- From GitLab 12.9, at the group level via **Group > Analytics > Value Stream**. **(PREMIUM)**
 - At the project level via **Project > Value Stream Analytics**.
 
 There are seven stages that are tracked as part of the Value Stream Analytics calculations.

ee/app/controllers/analytics/analytics_controller.rb

@@ -2,7 +2,7 @@
 
 class Analytics::AnalyticsController < Analytics::ApplicationController
   def index
-    if Feature.disabled?(:group_level_cycle_analytics) && Gitlab::Analytics.cycle_analytics_enabled?
+    if Feature.disabled?(:group_level_cycle_analytics, default_enabled: true) && Gitlab::Analytics.cycle_analytics_enabled?
       redirect_to analytics_cycle_analytics_path
     elsif can?(current_user, :read_instance_statistics)
       redirect_to instance_statistics_dev_ops_score_index_path

ee/app/helpers/ee/analytics_navbar_helper.rb

@@ -38,7 +38,7 @@ module EE
     end
 
     def group_cycle_analytics_navbar_link(group, current_user)
-      return unless ::Feature.enabled?(:group_level_cycle_analytics)
+      return unless ::Feature.enabled?(:group_level_cycle_analytics, default_enabled: true)
       return unless group_sidebar_link?(:cycle_analytics)
 
       navbar_sub_item(

ee/app/helpers/ee/dashboard_helper.rb

@@ -32,7 +32,7 @@ module EE
     end
 
     def analytics_nav_url
-      if ::Feature.disabled?(:group_level_cycle_analytics) && ::Gitlab::Analytics.any_features_enabled?
+      if ::Feature.disabled?(:group_level_cycle_analytics, default_enabled: true) && ::Gitlab::Analytics.any_features_enabled?
         return analytics_root_path
       end
 
@@ -48,7 +48,7 @@ module EE
     override :get_dashboard_nav_links
     def get_dashboard_nav_links
       super.tap do |links|
-        links << :analytics if ::Feature.disabled?(:group_level_cycle_analytics) && ::Gitlab::Analytics.any_features_enabled?
+        links << :analytics if ::Feature.disabled?(:group_level_cycle_analytics, default_enabled: true) && ::Gitlab::Analytics.any_features_enabled?
 
         if can?(current_user, :read_operations_dashboard)
           links << :environments if ::Feature.enabled?(:environments_dashboard, current_user, default_enabled: true)

ee/app/views/layouts/nav/sidebar/_analytics.html.haml

@@ -6,7 +6,7 @@
           = sprite_icon('chart', size: 24)
         .sidebar-context-title= _('Analytics')
     %ul.sidebar-top-level-items
-      - if Feature.disabled?(:group_level_cycle_analytics) && Gitlab::Analytics.cycle_analytics_enabled?
+      - if Feature.disabled?(:group_level_cycle_analytics, default_enabled: true) && Gitlab::Analytics.cycle_analytics_enabled?
         = nav_link(controller: :cycle_analytics) do
           = link_to analytics_cycle_analytics_path, class: 'qa-sidebar-cycle-analytics' do
             .nav-icon-container

ee/changelogs/unreleased/enable-group-ca-by-default.yml

+---
+title: Move Value Stream Analytics to the group level
+merge_request: 27304
+author:
+type: changed

ee/config/routes/group.rb

@@ -33,7 +33,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
     end
     namespace :analytics do
       resource :productivity_analytics, only: :show, constraints: -> (req) { Gitlab::Analytics.productivity_analytics_enabled? }
-      resource :cycle_analytics, path: 'value_stream_analytics', only: :show, constraints: -> (req) { Feature.enabled?(:group_level_cycle_analytics) && Gitlab::Analytics.cycle_analytics_enabled? }
+      resource :cycle_analytics, path: 'value_stream_analytics', only: :show, constraints: -> (req) { Feature.enabled?(:group_level_cycle_analytics, default_enabled: true) && Gitlab::Analytics.cycle_analytics_enabled? }
     end
 
     resource :ldap, only: [] do