diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 00:09:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 00:09:47 +0300 |
| commit | 3a51d1d11d8282ec011f1a79fa10b1ce370e9933 (patch) | |
| tree | 2730c6078b7641d9d25eb64df53ac0e44bd1f3c5 /app/services/service_desk_settings | |
| parent | 319ac09313e73485b47b8da7a67fb27e74f05721 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/service_desk_settings')
| -rw-r--r-- | app/services/service_desk_settings/update_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/service_desk_settings/update_service.rb b/app/services/service_desk_settings/update_service.rb index c837b75f439..32d1c5c1c87 100644 --- a/app/services/service_desk_settings/update_service.rb +++ b/app/services/service_desk_settings/update_service.rb @@ -5,7 +5,7 @@ module ServiceDeskSettings def execute settings = ServiceDeskSetting.safe_find_or_create_by!(project_id: project.id) - unless ::Feature.enabled?(:service_desk_custom_address, project) + unless ::Feature.enabled?(:service_desk_custom_address, project, default_enabled: true) params.delete(:project_key) end |