diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-10 09:11:57 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-10 09:11:57 +0000 |
commit | ef4c0a743bcfee11a647c9ada6249c3399888866 (patch) | |
tree | f43883d0089f43812fee15ba60c02554583d7643 /app/controllers/jira_connect/public_keys_controller.rb | |
parent | 36ff95a8a93225f47a833989429cc766a6ff2661 (diff) | |
download | gitlab-ce-ef4c0a743bcfee11a647c9ada6249c3399888866.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/jira_connect/public_keys_controller.rb')
-rw-r--r-- | app/controllers/jira_connect/public_keys_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/jira_connect/public_keys_controller.rb b/app/controllers/jira_connect/public_keys_controller.rb index 2d767cda699..4505ab16926 100644 --- a/app/controllers/jira_connect/public_keys_controller.rb +++ b/app/controllers/jira_connect/public_keys_controller.rb @@ -10,7 +10,7 @@ module JiraConnect skip_before_action :authenticate_user! def show - return render_404 unless Gitlab.config.jira_connect.enable_public_keys_storage + return render_404 unless public_key_storage_enabled? render plain: public_key.key end @@ -20,5 +20,11 @@ module JiraConnect def public_key JiraConnect::PublicKey.find(params[:id]) end + + def public_key_storage_enabled? + return true if Gitlab.config.jira_connect.enable_public_keys_storage + + Gitlab::CurrentSettings.jira_connect_public_key_storage_enabled? + end end end |