Commit 9b54c1c7 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Fix more Gitlab::CurrentSettings.current_application_settings

parent a7427f7b
...@@ -36,7 +36,8 @@ module SlashCommands ...@@ -36,7 +36,8 @@ module SlashCommands
def valid_token? def valid_token?
ActiveSupport::SecurityUtils.variable_size_secure_compare( ActiveSupport::SecurityUtils.variable_size_secure_compare(
current_application_settings.slack_app_verification_token, Gitlab::CurrentSettings.current_application_settings
.slack_app_verification_token,
params[:token] params[:token]
) )
end end
......
...@@ -46,7 +46,7 @@ module EE ...@@ -46,7 +46,7 @@ module EE
mirror_data.set_next_execution_timestamp! mirror_data.set_next_execution_timestamp!
end end
if current_application_settings.elasticsearch_indexing? if ::Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing?
project.run_after_commit do project.run_after_commit do
last_indexed_commit = project.index_status&.last_commit last_indexed_commit = project.index_status&.last_commit
ElasticCommitIndexerWorker.perform_async(project.id, last_indexed_commit) ElasticCommitIndexerWorker.perform_async(project.id, last_indexed_commit)
......
...@@ -7,7 +7,8 @@ module EE ...@@ -7,7 +7,8 @@ module EE
condition(:ldap_synced) { @subject.ldap_synced? } condition(:ldap_synced) { @subject.ldap_synced? }
condition(:can_owners_manage_ldap, scope: :global) do condition(:can_owners_manage_ldap, scope: :global) do
current_application_settings.allow_group_owners_to_manage_ldap ::Gitlab::CurrentSettings.current_application_settings
.allow_group_owners_to_manage_ldap
end end
rule { auditor }.enable :read_group rule { auditor }.enable :read_group
......
...@@ -5,7 +5,6 @@ module EE ...@@ -5,7 +5,6 @@ module EE
# and be prepended in the `PostReceive` worker # and be prepended in the `PostReceive` worker
module PostReceive module PostReceive
extend ActiveSupport::Concern extend ActiveSupport::Concern
extend ::Gitlab::CurrentSettings
private private
...@@ -28,7 +27,8 @@ module EE ...@@ -28,7 +27,8 @@ module EE
end end
def update_wiki_es_indexes(post_received) def update_wiki_es_indexes(post_received)
return unless current_application_settings.elasticsearch_indexing? return unless ::Gitlab::CurrentSettings.current_application_settings
.elasticsearch_indexing?
post_received.project.wiki.index_blobs post_received.project.wiki.index_blobs
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment