diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-23 21:10:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-23 21:10:41 +0300 |
| commit | 6a6e9bec88480863cc3e8fb5edc50744e00da964 (patch) | |
| tree | e663d6c9fe29259dd53f7bf10d4f5f796d467a2e /app/controllers/projects | |
| parent | 9919ffe0c8760e1e19e068d67a5ae6ae8aa67c5d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/service_desk_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/service_desk_controller.rb b/app/controllers/projects/service_desk_controller.rb index b1e30e7a45b..ca3cecf5949 100644 --- a/app/controllers/projects/service_desk_controller.rb +++ b/app/controllers/projects/service_desk_controller.rb @@ -36,7 +36,7 @@ class Projects::ServiceDeskController < Projects::ApplicationController service_desk_settings = project.service_desk_setting { - service_desk_address: project.service_desk_address, + service_desk_address: project.service_desk_system_address, service_desk_enabled: project.service_desk_enabled, issue_template_key: service_desk_settings&.issue_template_key, template_file_missing: service_desk_settings&.issue_template_missing?, |