diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 06:09:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 06:09:59 +0300 |
commit | e4f83735edac4909ea540472c34afcd4d359f252 (patch) | |
tree | 4552716142c900194e4143850d16aed781812c80 /app/services/environments | |
parent | 0da14b212b7f7e73114e437a671f39f2b7e758fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/environments')
-rw-r--r-- | app/services/environments/canary_ingress/update_service.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/services/environments/canary_ingress/update_service.rb b/app/services/environments/canary_ingress/update_service.rb index 2b510280873..f9813e5e86d 100644 --- a/app/services/environments/canary_ingress/update_service.rb +++ b/app/services/environments/canary_ingress/update_service.rb @@ -34,10 +34,6 @@ module Environments private def validate(environment) - unless Feature.enabled?(:canary_ingress_weight_control, environment.project, default_enabled: true) - return error(_("Feature flag is not enabled on the environment's project.")) - end - unless can?(current_user, :update_environment, environment) return error(_('You do not have permission to update the environment.')) end |