Add latest changes from gitlab-org/gitlab@master

Gemfile.checksum

@@ -126,7 +126,7 @@
 {"name":"discordrb-webhooks","version":"3.5.0","platform":"ruby","checksum":"52fba8bce3b08059d4a41a1e73a9a152958e788a9330275450126b44f01c23b1"},
 {"name":"docile","version":"1.4.0","platform":"ruby","checksum":"5f1734bde23721245c20c3d723e76c104208e1aa01277a69901ce770f0ebb8d3"},
 {"name":"domain_name","version":"0.5.20190701","platform":"ruby","checksum":"000a600454cb4a344769b2f10b531765ea7bd3a304fe47ed12e5ca1eab969851"},
-{"name":"doorkeeper","version":"5.8.1","platform":"ruby","checksum":"6d54f3c36755d8cfcb7e4f04fbcf1ff3492c816090ad78126ec8a722c292d26c"},
+{"name":"doorkeeper","version":"5.8.2","platform":"ruby","checksum":"a73d07aeaf590b1e7e2a35390446f23131c9f37bc0561653e514d3973f4d50d3"},
 {"name":"doorkeeper-device_authorization_grant","version":"1.0.3","platform":"ruby","checksum":"94c3ac12a0d50942850ecd58ed64298b397a5e903e8880cb68d4085600932679"},
 {"name":"doorkeeper-openid_connect","version":"1.8.11","platform":"ruby","checksum":"52a9a9c03176f5fa54d04b8f5378902beff126e3423fa447288b168276b7f6d3"},
 {"name":"dotenv","version":"2.7.6","platform":"ruby","checksum":"2451ed5e8e43776d7a787e51d6f8903b98e446146c7ad143d5678cc2c409d547"},

Gemfile.lock

@@ -559,7 +559,7 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.8.1)
+    doorkeeper (5.8.2)
       railties (>= 5)
     doorkeeper-device_authorization_grant (1.0.3)
       doorkeeper (~> 5.5)

Gemfile.next.checksum

@@ -126,7 +126,7 @@
 {"name":"discordrb-webhooks","version":"3.5.0","platform":"ruby","checksum":"52fba8bce3b08059d4a41a1e73a9a152958e788a9330275450126b44f01c23b1"},
 {"name":"docile","version":"1.4.0","platform":"ruby","checksum":"5f1734bde23721245c20c3d723e76c104208e1aa01277a69901ce770f0ebb8d3"},
 {"name":"domain_name","version":"0.5.20190701","platform":"ruby","checksum":"000a600454cb4a344769b2f10b531765ea7bd3a304fe47ed12e5ca1eab969851"},
-{"name":"doorkeeper","version":"5.8.1","platform":"ruby","checksum":"6d54f3c36755d8cfcb7e4f04fbcf1ff3492c816090ad78126ec8a722c292d26c"},
+{"name":"doorkeeper","version":"5.8.2","platform":"ruby","checksum":"a73d07aeaf590b1e7e2a35390446f23131c9f37bc0561653e514d3973f4d50d3"},
 {"name":"doorkeeper-device_authorization_grant","version":"1.0.3","platform":"ruby","checksum":"94c3ac12a0d50942850ecd58ed64298b397a5e903e8880cb68d4085600932679"},
 {"name":"doorkeeper-openid_connect","version":"1.8.11","platform":"ruby","checksum":"52a9a9c03176f5fa54d04b8f5378902beff126e3423fa447288b168276b7f6d3"},
 {"name":"dotenv","version":"2.7.6","platform":"ruby","checksum":"2451ed5e8e43776d7a787e51d6f8903b98e446146c7ad143d5678cc2c409d547"},

Gemfile.next.lock

@@ -559,7 +559,7 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.8.1)
+    doorkeeper (5.8.2)
       railties (>= 5)
     doorkeeper-device_authorization_grant (1.0.3)
       doorkeeper (~> 5.5)

app/helpers/routing/pseudonymization_helper.rb

@@ -95,7 +95,8 @@ def masked_query_params
     end
 
     def masked_page_url(group:, project:)
-      return unless Feature.enabled?(:mask_page_urls, type: :ops)
+      # Disabling of page url masking is only available when Snowplow is configured.
+      return if Gitlab::CurrentSettings.snowplow_enabled? && Feature.disabled?(:mask_page_urls, type: :ops)
 
       mask_helper = MaskHelper.new(request, group, project)
       mask_helper.mask_params

spec/helpers/routing/pseudonymization_helper_spec.rb

@@ -326,7 +326,28 @@
       stub_feature_flags(mask_page_urls: false)
     end
 
+    context 'when snowplow is enabled' do
+      before do
+        stub_application_setting(snowplow_enabled: true)
+      end
+
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
+    end
+
+    context 'when snowplow is disabled' do
+      before do
+        stub_application_setting(snowplow_enabled: false)
+      end
+
+      it 'does NOT return nil, but generates masked url' do
+        expect(subject).to eq("http://test.host")
+      end
+    end
+
     it 'returns nil' do
+      stub_application_setting(snowplow_enabled: true)
       expect(subject).to be_nil
     end
   end