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
62b63cd8
Commit
62b63cd8
authored
Feb 13, 2020
by
Nicolò Maria Mezzopera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove expiration_policy feature flag
- remove flag from helper - adjust tests - changelog file
parent
6c285a80
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
14 deletions
+6
-14
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-2
changelogs/unreleased/196843-remove-feature-flag.yml
changelogs/unreleased/196843-remove-feature-flag.yml
+5
-0
spec/features/projects/settings/registry_settings_spec.rb
spec/features/projects/settings/registry_settings_spec.rb
+0
-12
No files found.
app/helpers/projects_helper.rb
View file @
62b63cd8
...
...
@@ -720,7 +720,6 @@ module ProjectsHelper
end
def
settings_container_registry_expiration_policy_available?
(
project
)
Feature
.
enabled?
(
:registry_retention_policies_settings
,
project
)
&&
Gitlab
.
config
.
registry
.
enabled
&&
can?
(
current_user
,
:destroy_container_image
,
project
)
end
...
...
changelogs/unreleased/196843-remove-feature-flag.yml
0 → 100644
View file @
62b63cd8
---
title
:
Container Registry tag expiration policy settings
merge_request
:
25123
author
:
type
:
added
spec/features/projects/settings/registry_settings_spec.rb
View file @
62b63cd8
...
...
@@ -10,7 +10,6 @@ describe 'Project > Settings > CI/CD > Container registry tag expiration policy'
before
do
sign_in
(
user
)
stub_container_registry_config
(
enabled:
true
)
stub_feature_flags
(
registry_retention_policies_settings:
true
)
end
context
'as owner'
do
...
...
@@ -63,15 +62,4 @@ describe 'Project > Settings > CI/CD > Container registry tag expiration policy'
expect
(
page
).
not_to
have_selector
(
'#js-registry-policies'
)
end
end
context
'when feature flag is disabled'
do
before
do
stub_feature_flags
(
registry_retention_policies_settings:
false
)
visit
project_settings_ci_cd_path
(
project
)
end
it
'does not exists'
do
expect
(
page
).
not_to
have_selector
(
'#js-registry-policies'
)
end
end
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