Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 10 insertions, 2 deletions

diff --git a/app/controllers/jira_connect/installations_controller.rb b/app/controllers/jira_connect/installations_controller.rb
index 401bc4f9c87..44dbf90f5fb 100644
--- a/app/controllers/jira_connect/installations_controller.rb
+++ b/app/controllers/jira_connect/installations_controller.rb
@@ -6,11 +6,12 @@ class JiraConnect::InstallationsController < JiraConnect::ApplicationController
   end
 
   def update
-    if current_jira_installation.update(installation_params)
+    result = update_installation
+    if result.success?
       render json: installation_json(current_jira_installation)
     else
       render(
-        json: { errors: current_jira_installation.errors },
+        json: { errors: result.message },
         status: :unprocessable_entity
       )
     end
@@ -18,6 +19,13 @@ class JiraConnect::InstallationsController < JiraConnect::ApplicationController
 
   private
 
+  def update_installation
+    JiraConnectInstallations::UpdateService.execute(
+      current_jira_installation,
+      installation_params
+    )
+  end
+
   def installation_json(installation)
     {
       gitlab_com: installation.instance_url.blank?,