Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c3bf4692
Commit
c3bf4692
authored
Nov 10, 2020
by
Markus Koller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove group_wikis licensed feature flag
"Licensed"-type feature flags are being deprecated.
parent
cc302aec
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
52 deletions
+11
-52
config/initializers/0_inject_feature_flags.rb
config/initializers/0_inject_feature_flags.rb
+0
-1
doc/user/group/index.md
doc/user/group/index.md
+0
-26
ee/changelogs/unreleased/273362-remove-group-wikis-flag.yml
ee/changelogs/unreleased/273362-remove-group-wikis-flag.yml
+5
-0
ee/config/feature_flags/licensed/group_wikis.yml
ee/config/feature_flags/licensed/group_wikis.yml
+0
-8
ee/spec/lib/gitlab/git_access_wiki_spec.rb
ee/spec/lib/gitlab/git_access_wiki_spec.rb
+1
-1
ee/spec/policies/group_policy_spec.rb
ee/spec/policies/group_policy_spec.rb
+5
-15
spec/support/helpers/wiki_helpers.rb
spec/support/helpers/wiki_helpers.rb
+0
-1
No files found.
config/initializers/0_inject_feature_flags.rb
View file @
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
...
...
doc/user/group/index.md
View file @
c3bf4692
...
...
@@ -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.
...
...
ee/changelogs/unreleased/273362-remove-group-wikis-flag.yml
0 → 100644
View file @
c3bf4692
---
title
:
Remove group_wikis feature flag
merge_request
:
47291
author
:
type
:
changed
ee/config/feature_flags/licensed/group_wikis.yml
deleted
100644 → 0
View file @
cc302aec
---
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
ee/spec/lib/gitlab/git_access_wiki_spec.rb
View file @
c3bf4692
...
...
@@ -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
...
...
ee/spec/policies/group_policy_spec.rb
View file @
c3bf4692
...
...
@@ -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_flag
s
(
group_wikis:
true
)
stub_
licensed_feature
s
(
group_wikis:
true
)
when
ProjectFeature
::
DISABLED
stub_
feature_flag
s
(
group_wikis:
false
)
stub_
licensed_feature
s
(
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
)
}
...
...
spec/support/helpers/wiki_helpers.rb
View file @
c3bf4692
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment