Add latest changes from gitlab-org/gitlab@master

Gemfile

@@ -295,7 +295,7 @@ gem 'gon', '~> 6.4.0'
 gem 'request_store', '~> 1.5'
 gem 'base32', '~> 0.3.0'
 
-gem 'gitlab-license', '~> 2.0'
+gem 'gitlab-license', '~> 2.1.0'
 
 # Protect against bruteforcing
 gem 'rack-attack', '~> 6.3.0'

Gemfile.lock

@@ -481,7 +481,7 @@ GEM
       opentracing (~> 0.4)
       pg_query (~> 2.1)
       redis (> 3.0.0, < 5.0.0)
-    gitlab-license (2.0.0)
+    gitlab-license (2.1.0)
     gitlab-license_finder (6.14.2.1)
       bundler
       rubyzip (>= 1, < 3)
@@ -1477,7 +1477,7 @@ DEPENDENCIES
   gitlab-experiment (~> 0.6.5)
   gitlab-fog-azure-rm (~> 1.2.0)
   gitlab-labkit (~> 0.21.3)
-  gitlab-license (~> 2.0)
+  gitlab-license (~> 2.1.0)
   gitlab-license_finder (~> 6.0)
   gitlab-mail_room (~> 0.0.9)
   gitlab-markup (~> 1.8.0)

doc/ci/yaml/index.md

@@ -1467,7 +1467,7 @@ Use `environment` to define the [environment](../environments/index.md) that a j
 formats:
 
 - Plain text, including letters, digits, spaces, and these characters: `-`, `_`, `/`, `$`, `{`, `}`.
-- CI/CD variables, including predefined, secure, or variables defined in the
+- CI/CD variables, including predefined, project, group, instance, or variables defined in the
   `.gitlab-ci.yml` file. You can't use variables defined in a `script` section.
 
 **Example of `environment`**:
@@ -1496,7 +1496,7 @@ Common environment names are `qa`, `staging`, and `production`, but you can use
 formats:
 
 - Plain text, including letters, digits, spaces, and these characters: `-`, `_`, `/`, `$`, `{`, `}`.
-- CI/CD variables, including predefined, secure, or variables defined in the
+- CI/CD variables, including predefined, project, group, instance, or variables defined in the
   `.gitlab-ci.yml` file. You can't use variables defined in a `script` section.
 
 **Example of `environment:name`**:
@@ -1518,7 +1518,7 @@ Set a URL for an [environment](../environments/index.md).
 **Possible inputs**: A single URL, in one of these formats:
 
 - Plain text, like `https://prod.example.com`.
-- CI/CD variables, including predefined, secure, or variables defined in the
+- CI/CD variables, including predefined, project, group, instance, or variables defined in the
   `.gitlab-ci.yml` file. You can't use variables defined in a `script` section.
 
 **Example of `environment:url`**:

lib/gitlab/ci/reports/security/finding.rb

@@ -171,11 +171,21 @@ module Gitlab
             original_data['location']
           end
 
+          def location_fingerprint
+            max_priority_signature_hex || location&.fingerprint
+          end
+
           private
 
           def generate_project_fingerprint
             Digest::SHA1.hexdigest(compare_key)
           end
+
+          def max_priority_signature_hex
+            return unless @vulnerability_finding_signatures_enabled && signatures.present?
+
+            signatures.max_by(&:priority).signature_hex
+          end
         end
       end
     end