Add latest changes from gitlab-org/gitlab@master

app/models/concerns/admin_changed_password_notifier.rb

@@ -30,12 +30,10 @@ module AdminChangedPasswordNotifier
   extend ActiveSupport::Concern
 
   included do
-    after_update :send_admin_changed_your_password_notification, if: :send_admin_changed_your_password_notification?
-  end
+    # default value of this attribute is `nil`, so these emails are off by default
+    attr_accessor :allow_admin_changed_your_password_notification
 
-  def initialize(*args, &block)
-    @allow_admin_changed_your_password_notification = false # These emails are off by default
-    super
+    after_update :send_admin_changed_your_password_notification, if: :send_admin_changed_your_password_notification?
   end
 
   def send_only_admin_changed_your_password_notification!
@@ -50,11 +48,11 @@ module AdminChangedPasswordNotifier
   end
 
   def allow_admin_changed_your_password_notification!
-    @allow_admin_changed_your_password_notification = true # rubocop:disable Gitlab/ModuleWithInstanceVariables
+    self.allow_admin_changed_your_password_notification = true
   end
 
   def send_admin_changed_your_password_notification?
     self.class.send_password_change_notification && saved_change_to_encrypted_password? &&
-    @allow_admin_changed_your_password_notification # rubocop:disable Gitlab/ModuleWithInstanceVariables
+    allow_admin_changed_your_password_notification
   end
 end

app/services/service_ping/submit_service.rb

@@ -3,7 +3,7 @@
 module ServicePing
   class SubmitService
     PRODUCTION_BASE_URL = 'https://version.gitlab.com'
-    STAGING_BASE_URL = 'https://gitlab-services-version-gitlab-com-staging.gs-staging.gitlab.org'
+    STAGING_BASE_URL = 'https://gitlab-org-gitlab-services-version-gitlab-com-staging.version-staging.gitlab.org'
     USAGE_DATA_PATH = 'usage_data'
     ERROR_PATH = 'usage_ping_errors'
     METADATA_PATH = 'usage_ping_metadata'

doc/integration/jira/connect-app.md

@@ -105,7 +105,11 @@ To create branches from Jira Cloud, [install the app manually](#install-the-gitl
 - The instance must be publicly available.
 - The instance must be on GitLab version 15.7 or later.
 - You must set up [OAuth authentication](#set-up-oauth-authentication-for-self-managed-instances).
-- Your network must allow inbound and outbound connections between GitLab and Jira.
+- Your network must allow inbound and outbound connections between GitLab and Jira. For self-managed instances that are behind a
+  firewall and cannot be directly accessed from the internet, you can:
+  - Open your firewall and only allow inbound traffic from [Atlassian IP addresses](https://support.atlassian.com/organization-administration/docs/ip-addresses-and-domains-for-atlassian-cloud-products/#Outgoing-Connections).
+  - Set up an internet-facing reverse proxy in front of your self-managed instance. To secure this proxy further, only allow inbound
+    traffic from [Atlassian IP addresses](https://support.atlassian.com/organization-administration/docs/ip-addresses-and-domains-for-atlassian-cloud-products/#Outgoing-Connections).
 
 ### Set up your instance
 

doc/user/admin_area/settings/usage_statistics.md

@@ -112,7 +112,7 @@ sequenceDiagram
 ## Configure your network
 
 To send usage statistics to GitLab Inc., you must allow network traffic from your
-GitLab instance to the IP address `104.196.17.203:443`.
+GitLab instance to the host `version.gitlab.com` on port `443`.
 
 If your GitLab instance is behind a proxy, set the appropriate
 [proxy configuration variables](https://docs.gitlab.com/omnibus/settings/environment-variables.html).

doc/user/compliance/license_scanning_of_cyclonedx_files/index.md

@@ -23,7 +23,7 @@ Licenses not in the SPDX list are reported as "Unknown". License information can
 
 Prerequisites:
 
-- Enable [Synchronization with the GitLab License Database](../../admin_area/settings/security_and_compliance.md#choose-package-registry-metadata-to-sync) in Admin Area for the GitLab instance. On GitLab SaaS this step has already been completed.
+- On GitLab self-managed only, enable [Synchronization with the GitLab License Database](../../admin_area/settings/security_and_compliance.md#choose-package-registry-metadata-to-sync) in Admin Area for the GitLab instance. On GitLab SaaS this step has already been completed.
 - Enable [Dependency Scanning](../../application_security/dependency_scanning/index.md#configuration)
   and ensure that its prerequisites are met.