summaryrefslogtreecommitdiff
path: root/app/controllers/groups
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-28 15:07:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-28 15:07:23 +0000
commit20d52aa39ef79bc199e1459e385387baeb04d99f (patch)
treee13dc3aec8c70ad4c522452068b96fd98f2b3fa5 /app/controllers/groups
parentd30b2ead9a6606035a5d650216b9b5630b010421 (diff)
downloadgitlab-ce-20d52aa39ef79bc199e1459e385387baeb04d99f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/groups')
-rw-r--r--app/controllers/groups/usage_quotas_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/groups/usage_quotas_controller.rb b/app/controllers/groups/usage_quotas_controller.rb
index 29878f0001d..b660eb3af99 100644
--- a/app/controllers/groups/usage_quotas_controller.rb
+++ b/app/controllers/groups/usage_quotas_controller.rb
@@ -16,8 +16,7 @@ module Groups
private
def verify_usage_quotas_enabled!
- render_404 unless Feature.enabled?(:usage_quotas_for_all_editions, group)
- render_404 if group.has_parent?
+ render_404 unless group.usage_quotas_enabled?
end
# To be overriden in ee/app/controllers/ee/groups/usage_quotas_controller.rb