Merge branch '210026-beta-feature-flag-enable-status-page-mvc-by-default' into 'master'

Make Status Page MVC generally available

See merge request gitlab-org/gitlab!28966

ee/app/controllers/ee/projects/settings/operations_controller.rb

@@ -25,8 +25,7 @@ module EE
           end
 
           def has_status_page_license?
-            project.feature_available?(:status_page, current_user) &&
-            project.beta_feature_available?(:status_page)
+            project.feature_available?(:status_page, current_user)
           end
 
           def track_tracing_external_url

ee/app/models/status_page_setting.rb

@@ -38,9 +38,7 @@ class StatusPageSetting < ApplicationRecord
   end
 
   def enabled?
-    super &&
-      project&.feature_available?(:status_page) &&
-      project&.beta_feature_available?(:status_page)
+    super && project&.feature_available?(:status_page)
   end
 
   def storage_client

ee/app/policies/ee/project_policy.rb

@@ -123,8 +123,7 @@ module EE
       end
 
       condition(:status_page_available) do
-        @subject.feature_available?(:status_page, @user) &&
-          @subject.beta_feature_available?(:status_page)
+        @subject.feature_available?(:status_page, @user)
       end
 
       condition(:group_timelogs_available) do

ee/app/views/projects/settings/operations/_status_page.html.haml

-- return unless @project.feature_available?(:status_page, current_user) && @project.beta_feature_available?(:status_page)
+- return unless @project.feature_available?(:status_page, current_user)
 
 .js-status-page-settings{ data: status_page_settings_data }

ee/changelogs/unreleased/210026-beta-feature-flag-enable-status-page-mvc-by-default.yml

+---
+title: Make Status Page MVC generally available
+merge_request: 28966
+author:
+type: added

ee/spec/controllers/projects/settings/operations_controller_spec.rb

@@ -296,14 +296,6 @@ describe Projects::Settings::OperationsController do
         end
 
         it { is_expected.to be_a(StatusPage::ProjectSetting) }
-
-        context 'when feature flag is disabled' do
-          before do
-            stub_feature_flags(status_page: false)
-          end
-
-          it { is_expected.to be_nil }
-        end
       end
 
       context 'with existing status page setting' do

ee/spec/models/status_page/project_setting_spec.rb

@@ -126,7 +126,7 @@ describe StatusPage::ProjectSetting do
 
     it { is_expected.to eq(true) }
 
-    context 'when status page setting is diabled' do
+    context 'when status page setting is disabled' do
       before do
         status_page_setting.enabled = false
       end
@@ -141,14 +141,6 @@ describe StatusPage::ProjectSetting do
 
       it { is_expected.to eq(false) }
     end
-
-    context 'when feature flag is disabled' do
-      before do
-        stub_feature_flags(status_page: false)
-      end
-
-      it { is_expected.to eq(false) }
-    end
   end
 
   describe '#storage_client' do

ee/spec/services/status_page/trigger_publish_service_spec.rb

@@ -235,14 +235,6 @@ describe StatusPage::TriggerPublishService do
         end
       end
 
-      context 'when feature is disabled' do
-        include_examples 'no trigger status page publish' do
-          before do
-            stub_feature_flags(status_page: false)
-          end
-        end
-      end
-
       context 'when user cannot publish status page' do
         include_examples 'no trigger status page publish' do
           before do

ee/spec/support/shared_contexts/status_page/status_page_enabled_context.rb

@@ -4,7 +4,6 @@ RSpec.shared_context 'status page enabled' do
   before do
     project.add_maintainer(user)
 
-    stub_feature_flags(status_page: true)
     stub_licensed_features(status_page: true)
 
     unless project.status_page_setting