Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 11 deletions

diff --git a/app/controllers/jira_connect/app_descriptor_controller.rb b/app/controllers/jira_connect/app_descriptor_controller.rb
index e96242c7052..16bd73f5ab6 100644
--- a/app/controllers/jira_connect/app_descriptor_controller.rb
+++ b/app/controllers/jira_connect/app_descriptor_controller.rb
@@ -32,7 +32,7 @@ class JiraConnect::AppDescriptorController < JiraConnect::ApplicationController
       apiVersion: 1,
       apiMigrations: {
         'context-qsh': true,
-        'signed-install': signed_install_active?,
+        'signed-install': true,
         gdpr: true
       }
     }
diff --git a/app/controllers/jira_connect/application_controller.rb b/app/controllers/jira_connect/application_controller.rb
index 1d1575f3a05..352e78d6255 100644
--- a/app/controllers/jira_connect/application_controller.rb
+++ b/app/controllers/jira_connect/application_controller.rb
@@ -74,8 +74,4 @@ class JiraConnect::ApplicationController < ApplicationController
       params[:jwt] || request.headers['Authorization']&.split(' ', 2)&.last
     end
   end
-
-  def signed_install_active?
-    Feature.enabled?(:jira_connect_asymmetric_jwt, default_enabled: :yaml)
-  end
 end
diff --git a/app/controllers/jira_connect/events_controller.rb b/app/controllers/jira_connect/events_controller.rb
index 76ac15f7631..1ea0a92662b 100644
--- a/app/controllers/jira_connect/events_controller.rb
+++ b/app/controllers/jira_connect/events_controller.rb
@@ -4,14 +4,9 @@ class JiraConnect::EventsController < JiraConnect::ApplicationController
   # See https://developer.atlassian.com/cloud/jira/software/app-descriptor/#lifecycle
 
   skip_before_action :verify_atlassian_jwt!
-  before_action :verify_asymmetric_atlassian_jwt!, if: :signed_install_active?
-
-  before_action :verify_atlassian_jwt!, only: :uninstalled, unless: :signed_install_active?
-  before_action :verify_qsh_claim!, only: :uninstalled, unless: :signed_install_active?
+  before_action :verify_asymmetric_atlassian_jwt!
 
   def installed
-    return head :ok if !signed_install_active? && atlassian_jwt_valid?
-
     return head :ok if current_jira_installation
 
     installation = JiraConnectInstallation.new(event_params)