Add latest changes from gitlab-org/gitlab@master

Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 6.1.6.1'
 
-gem 'bootsnap', '~> 1.12.0', require: false
+gem 'bootsnap', '~> 1.13.0', require: false
 
 # Responders respond_to and respond_with
 gem 'responders', '~> 3.0'

Gemfile.lock

@@ -184,7 +184,7 @@ GEM
       rack (>= 0.9.0)
     bindata (2.4.10)
     binding_ninja (0.2.3)
-    bootsnap (1.12.0)
+    bootsnap (1.13.0)
       msgpack (~> 1.2)
     bootstrap_form (4.2.0)
       actionpack (>= 5.0)
@@ -817,7 +817,7 @@ GEM
       faraday (>= 0.9, < 2.0.0)
       faraday-cookie_jar (~> 0.0.6)
       ms_rest (~> 0.7.6)
-    msgpack (1.5.2)
+    msgpack (1.5.4)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
@@ -1501,7 +1501,7 @@ DEPENDENCIES
   benchmark-ips (~> 2.3.0)
   benchmark-memory (~> 0.1)
   better_errors (~> 2.9.0)
-  bootsnap (~> 1.12.0)
+  bootsnap (~> 1.13.0)
   bootstrap_form (~> 4.2.0)
   browser (~> 4.2)
   bullet (~> 6.1.3)

app/assets/javascripts/related_issues/constants.js

@@ -115,7 +115,7 @@ export const PathIdSeparator = {
 
 export const issuablesBlockHeaderTextMap = {
   [issuableTypesMap.ISSUE]: __('Linked items'),
-  [issuableTypesMap.INCIDENT]: __('Related incidents or issues'),
+  [issuableTypesMap.INCIDENT]: __('Linked incidents or issues'),
   [issuableTypesMap.EPIC]: __('Linked epics'),
 };
 

locale/gitlab.pot

@@ -23553,6 +23553,9 @@ msgstr ""
 msgid "Linked epics"
 msgstr ""
 
+msgid "Linked incidents or issues"
+msgstr ""
+
 msgid "Linked items"
 msgstr ""
 
@@ -32236,9 +32239,6 @@ msgstr ""
 msgid "Related feature flags"
 msgstr ""
 
-msgid "Related incidents or issues"
-msgstr ""
-
 msgid "Related issues"
 msgstr ""
 

qa/qa/runtime/env.rb

@@ -492,6 +492,10 @@ module QA
         ENV.fetch('MAX_CAPYBARA_WAIT_TIME', 10).to_i
       end
 
+      def use_public_ip_api?
+        enabled?(ENV['QA_USE_PUBLIC_IP_API'], default: false)
+      end
+
       private
 
       def remote_grid_credentials

qa/qa/runtime/ip_address.rb

@@ -13,7 +13,10 @@ module QA
       def fetch_current_ip_address
         # When running on CI against a live environment such as staging.gitlab.com,
         # we use the public facing IP address
-        ip_address = if Env.running_in_ci? && !URI.parse(Scenario.gitlab_address).host.include?('.test')
+        non_test_host = !URI.parse(Scenario.gitlab_address).host.include?('.test')
+        has_no_public_ip = Env.running_in_ci? || Env.use_public_ip_api?
+
+        ip_address = if has_no_public_ip && non_test_host
                        response = get(PUBLIC_IP_ADDRESS_API)
                        raise HostUnreachableError, "#{PUBLIC_IP_ADDRESS_API} is unreachable" unless response.code == Support::API::HTTP_STATUS_OK