Commit 34ab9be9 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖

Add latest changes from gitlab-org/gitlab@master

parent 08ed6a86
Pipeline #109796328 passed with stages
in 108 minutes and 27 seconds
......@@ -352,7 +352,7 @@ module ApplicationSettingsHelper
status_delete_self_monitoring_project_admin_application_settings_path,
'self_monitoring_project_exists' =>
Gitlab::CurrentSettings.instance_administration_project.present?,
Gitlab::CurrentSettings.instance_administration_project.present?.to_s,
'self_monitoring_project_full_path' =>
Gitlab::CurrentSettings.instance_administration_project&.full_path
......
......@@ -39,7 +39,7 @@
%hr
%h5
= _('Groups (%{count})') % { count: @group_notifications.count }
= _('Groups (%{count})') % { count: @group_notifications.size }
%div
- @group_notifications.each do |setting|
= render 'group_settings', setting: setting, group: setting.source
......
......@@ -11,6 +11,13 @@ Creates a new Geo node.
POST /geo_nodes
```
```bash
curl --header "PRIVATE-TOKEN: <your_access_token>" https://primary.example.com/api/v4/geo_nodes \
--request POST \
-d "name=himynameissomething" \
-d "url=https://another-node.example.com/"
```
| Attribute | Type | Required | Description |
| ----------------------------| ------- | -------- | -----------------------------------------------------------------|
| `primary` | boolean | no | Specifying whether this node will be primary. Defaults to false. |
......
......@@ -92,7 +92,7 @@ describe ApplicationSettingsHelper do
it 'returns self_monitoring_project_exists false' do
expect(helper.self_monitoring_project_data).to include(
'self_monitoring_project_exists' => false
'self_monitoring_project_exists' => "false"
)
end
......@@ -112,7 +112,7 @@ describe ApplicationSettingsHelper do
it 'returns self_monitoring_project_exists true' do
expect(helper.self_monitoring_project_data).to include(
'self_monitoring_project_exists' => true
'self_monitoring_project_exists' => "true"
)
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