Commit 58735e25 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '273362-remove-group-wikis-flag' into 'master'

Remove group_wikis licensed feature flag

See merge request gitlab-org/gitlab!47291
parents 6b80dc05 c3bf4692
......@@ -14,7 +14,6 @@ if Gitlab.ee? && Gitlab.dev_or_test_env?
# being unique to licensed names. These feature flags should be reworked to
# be "development" with explicit check
IGNORED_FEATURE_FLAGS = %i[
group_wikis
swimlanes
].to_set
......
......@@ -394,13 +394,6 @@ milestones.
## Group wikis **(PREMIUM)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13195) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.5.
> - It's [deployed behind a feature flag](../feature_flags.md), enabled by default.
> - 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-group-wikis).
CAUTION: **Warning:**
This feature might not be available to you. Check the **version history** note above for details.
Group wikis work the same way as [project wikis](../project/wiki/index.md), please refer to those docs for details on usage.
......@@ -422,25 +415,6 @@ For updates, you can follow:
- [The epic tracking feature parity with project wikis](https://gitlab.com/groups/gitlab-org/-/epics/2782).
- [The issue for adding the ability to move group wikis using the API](https://gitlab.com/gitlab-org/gitlab/-/issues/219003).
### Enable or disable group wikis **(PREMIUM ONLY)**
Group wikis are under development but ready for production use.
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 opt to disable it for your instance.
To enable it:
```ruby
Feature.enable(:group_wikis)
```
To disable it:
```ruby
Feature.disable(:group_wikis)
```
## Group Security Dashboard **(ULTIMATE)**
Get an overview of the vulnerabilities of all the projects in a group and its subgroups.
......
---
title: Remove group_wikis feature flag
merge_request: 47291
author:
type: changed
---
name: group_wikis
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29176
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207888
milestone: '12.10'
type: licensed
group: group::knowledge
default_enabled: true
......@@ -23,7 +23,7 @@ RSpec.describe Gitlab::GitAccessWiki do
end
describe 'group wiki access' do
let_it_be(:group) { create(:group, :private, :wiki_repo) }
let_it_be_with_refind(:group) { create(:group, :private, :wiki_repo) }
let(:wiki) { create(:group_wiki, group: group) }
describe '#push_access_check' do
......
......@@ -1174,7 +1174,7 @@ RSpec.describe GroupPolicy do
end
it_behaves_like 'model with wiki policies' do
let_it_be(:container) { create(:group_with_plan, plan: :silver_plan) }
let_it_be_with_refind(:container) { create(:group_with_plan, plan: :silver_plan) }
let_it_be(:user) { owner }
before_all do
......@@ -1182,32 +1182,22 @@ RSpec.describe GroupPolicy do
end
before do
stub_application_setting(check_namespace_plan: true)
enable_namespace_license_check!
end
# We don't have feature toggles on groups yet, so we currently simulate
# this by toggling the feature flag instead.
# this by stubbing the license check instead.
def set_access_level(access_level)
case access_level
when ProjectFeature::ENABLED
stub_feature_flags(group_wikis: true)
stub_licensed_features(group_wikis: true)
when ProjectFeature::DISABLED
stub_feature_flags(group_wikis: false)
stub_licensed_features(group_wikis: false)
when ProjectFeature::PRIVATE
skip('Access level private is not supported yet for group wikis, see https://gitlab.com/gitlab-org/gitlab/-/issues/208412')
end
end
context 'when the feature flag is disabled on this group' do
before do
stub_feature_flags(group_wikis: create(:group))
end
it 'does not include the wiki permissions' do
expect_disallowed(*wiki_permissions[:all])
end
end
context 'when the feature is not licensed on this group' do
let_it_be(:container) { create(:group_with_plan, plan: :bronze_plan) }
......
......@@ -4,7 +4,6 @@ module WikiHelpers
extend self
def stub_group_wikis(enabled)
stub_feature_flags(group_wikis: enabled)
stub_licensed_features(group_wikis: enabled)
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