Commit 5b8fbef7 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch '32351-fix-helper' into 'master'

Change boolean value to string in helper

See merge request gitlab-org/gitlab!23068
parents bc013f51 89b6de94
...@@ -352,7 +352,7 @@ module ApplicationSettingsHelper ...@@ -352,7 +352,7 @@ module ApplicationSettingsHelper
status_delete_self_monitoring_project_admin_application_settings_path, status_delete_self_monitoring_project_admin_application_settings_path,
'self_monitoring_project_exists' => 'self_monitoring_project_exists' =>
Gitlab::CurrentSettings.instance_administration_project.present?, Gitlab::CurrentSettings.instance_administration_project.present?.to_s,
'self_monitoring_project_full_path' => 'self_monitoring_project_full_path' =>
Gitlab::CurrentSettings.instance_administration_project&.full_path Gitlab::CurrentSettings.instance_administration_project&.full_path
......
...@@ -92,7 +92,7 @@ describe ApplicationSettingsHelper do ...@@ -92,7 +92,7 @@ describe ApplicationSettingsHelper do
it 'returns self_monitoring_project_exists false' do it 'returns self_monitoring_project_exists false' do
expect(helper.self_monitoring_project_data).to include( expect(helper.self_monitoring_project_data).to include(
'self_monitoring_project_exists' => false 'self_monitoring_project_exists' => "false"
) )
end end
...@@ -112,7 +112,7 @@ describe ApplicationSettingsHelper do ...@@ -112,7 +112,7 @@ describe ApplicationSettingsHelper do
it 'returns self_monitoring_project_exists true' do it 'returns self_monitoring_project_exists true' do
expect(helper.self_monitoring_project_data).to include( expect(helper.self_monitoring_project_data).to include(
'self_monitoring_project_exists' => true 'self_monitoring_project_exists' => "true"
) )
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