Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-18 16:16:36 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-18 16:16:36 +0300
commit311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch)
tree07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/controllers/jira_connect/events_controller.rb
parent27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff)
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/controllers/jira_connect/events_controller.rb')
-rw-r--r--app/controllers/jira_connect/events_controller.rb7
1 files changed, 1 insertions, 6 deletions
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)