diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 00:10:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 00:10:47 +0300 |
| commit | eb489ab3e7e208a136ea47b3589cc5e3a41ed5d5 (patch) | |
| tree | 7b85c6fe51dd5f79b4697820a0b779866889950e /app/views/projects/_service_desk_settings.html.haml | |
| parent | 141ef7e93971ca11f404065554f6cc1e43e46a80 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/_service_desk_settings.html.haml')
| -rw-r--r-- | app/views/projects/_service_desk_settings.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_service_desk_settings.html.haml b/app/views/projects/_service_desk_settings.html.haml index a3b90862cd2..5fab242ed5c 100644 --- a/app/views/projects/_service_desk_settings.html.haml +++ b/app/views/projects/_service_desk_settings.html.haml @@ -12,7 +12,7 @@ enabled: "#{@project.service_desk_enabled}", incoming_email: (@project.service_desk_incoming_address if @project.service_desk_enabled), custom_email: (@project.service_desk_custom_address if @project.service_desk_enabled), - custom_email_enabled: "#{@project.service_desk_custom_address_enabled?}", + custom_email_enabled: "#{Gitlab::ServiceDeskEmail.enabled?}", selected_template: "#{@project.service_desk_setting&.issue_template_key}", outgoing_name: "#{@project.service_desk_setting&.outgoing_name}", project_key: "#{@project.service_desk_setting&.project_key}", |