Commit 98d9a16e authored by Dmitry Gruzd's avatar Dmitry Gruzd

Fix QA specs 500 error

parent 0e35db54
...@@ -45,7 +45,7 @@ module EE ...@@ -45,7 +45,7 @@ module EE
def prevent_elasticsearch_indexing_update? def prevent_elasticsearch_indexing_update?
!application_setting.elasticsearch_indexing && !application_setting.elasticsearch_indexing &&
params[:elasticsearch_indexing].to_i.positive? && ::Gitlab::Utils.to_boolean(params[:elasticsearch_indexing]) &&
!::Gitlab::Elastic::Helper.index_exists? !::Gitlab::Elastic::Helper.index_exists?
end end
end end
......
...@@ -20,7 +20,7 @@ describe Admin::ApplicationSettingsController do ...@@ -20,7 +20,7 @@ describe Admin::ApplicationSettingsController do
settings = { settings = {
help_text: 'help_text', help_text: 'help_text',
elasticsearch_url: 'http://my-elastic.search:9200', elasticsearch_url: 'http://my-elastic.search:9200',
elasticsearch_indexing: true, elasticsearch_indexing: false,
elasticsearch_aws: true, elasticsearch_aws: true,
elasticsearch_aws_access_key: 'elasticsearch_aws_access_key', elasticsearch_aws_access_key: 'elasticsearch_aws_access_key',
elasticsearch_aws_secret_access_key: 'elasticsearch_aws_secret_access_key', elasticsearch_aws_secret_access_key: 'elasticsearch_aws_secret_access_key',
......
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