Add latest changes from gitlab-org/gitlab@master

4 files changed, 11 insertions, 4 deletions

diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 077035a49ed..66cb5d2bedb 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -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
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 01aa6f06b98..73f6a821b51 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -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
diff --git a/doc/api/geo_nodes.md b/doc/api/geo_nodes.md
index 2786d00ebbd..f54694ed15b 100644
--- a/doc/api/geo_nodes.md
+++ b/doc/api/geo_nodes.md
@@ -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. |
diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb
index e5deeb990a1..41008ff8eaf 100644
--- a/spec/helpers/application_settings_helper_spec.rb
+++ b/spec/helpers/application_settings_helper_spec.rb
@@ -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