Commit 172bd5a3 authored by Peter Leitzen's avatar Peter Leitzen

Make Status Page MVC generally available

Remove the beta feature flag which enables Status Page MVC by default
for all GitLab Ultimate users.
parent 1d478913
...@@ -25,8 +25,7 @@ module EE ...@@ -25,8 +25,7 @@ module EE
end end
def has_status_page_license? def has_status_page_license?
project.feature_available?(:status_page, current_user) && project.feature_available?(:status_page, current_user)
project.beta_feature_available?(:status_page)
end end
def track_tracing_external_url def track_tracing_external_url
......
...@@ -38,9 +38,7 @@ class StatusPageSetting < ApplicationRecord ...@@ -38,9 +38,7 @@ class StatusPageSetting < ApplicationRecord
end end
def enabled? def enabled?
super && super && project&.feature_available?(:status_page)
project&.feature_available?(:status_page) &&
project&.beta_feature_available?(:status_page)
end end
def storage_client def storage_client
......
...@@ -123,8 +123,7 @@ module EE ...@@ -123,8 +123,7 @@ module EE
end end
condition(:status_page_available) do condition(:status_page_available) do
@subject.feature_available?(:status_page, @user) && @subject.feature_available?(:status_page, @user)
@subject.beta_feature_available?(:status_page)
end end
condition(:group_timelogs_available) do condition(:group_timelogs_available) do
......
- 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 } .js-status-page-settings{ data: status_page_settings_data }
---
title: Make Status Page MVC generally available
merge_request: 28966
author:
type: added
...@@ -296,14 +296,6 @@ describe Projects::Settings::OperationsController do ...@@ -296,14 +296,6 @@ describe Projects::Settings::OperationsController do
end end
it { is_expected.to be_a(StatusPage::ProjectSetting) } 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 end
context 'with existing status page setting' do context 'with existing status page setting' do
......
...@@ -99,7 +99,7 @@ describe StatusPage::ProjectSetting do ...@@ -99,7 +99,7 @@ describe StatusPage::ProjectSetting do
it { is_expected.to eq(true) } it { is_expected.to eq(true) }
context 'when status page setting is diabled' do context 'when status page setting is disabled' do
before do before do
status_page_setting.enabled = false status_page_setting.enabled = false
end end
...@@ -114,14 +114,6 @@ describe StatusPage::ProjectSetting do ...@@ -114,14 +114,6 @@ describe StatusPage::ProjectSetting do
it { is_expected.to eq(false) } it { is_expected.to eq(false) }
end 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 end
describe '#storage_client' do describe '#storage_client' do
......
...@@ -235,14 +235,6 @@ describe StatusPage::TriggerPublishService do ...@@ -235,14 +235,6 @@ describe StatusPage::TriggerPublishService do
end end
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 context 'when user cannot publish status page' do
include_examples 'no trigger status page publish' do include_examples 'no trigger status page publish' do
before do before do
......
...@@ -4,7 +4,6 @@ RSpec.shared_context 'status page enabled' do ...@@ -4,7 +4,6 @@ RSpec.shared_context 'status page enabled' do
before do before do
project.add_maintainer(user) project.add_maintainer(user)
stub_feature_flags(status_page: true)
stub_licensed_features(status_page: true) stub_licensed_features(status_page: true)
unless project.status_page_setting unless project.status_page_setting
......
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