Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
98d9a16e
Commit
98d9a16e
authored
Mar 05, 2020
by
Dmitry Gruzd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix QA specs 500 error
parent
0e35db54
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/services/ee/application_settings/update_service.rb
ee/app/services/ee/application_settings/update_service.rb
+1
-1
ee/spec/controllers/admin/application_settings_controller_spec.rb
...controllers/admin/application_settings_controller_spec.rb
+1
-1
No files found.
ee/app/services/ee/application_settings/update_service.rb
View file @
98d9a16e
...
@@ -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
...
...
ee/spec/controllers/admin/application_settings_controller_spec.rb
View file @
98d9a16e
...
@@ -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:
tru
e
,
elasticsearch_indexing:
fals
e
,
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'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment