Automatic merge of gitlab-org/gitlab master

doc/subscriptions/customers_portal.md

@@ -24,7 +24,7 @@ If you registered for Customers Portal with your GitLab.com account, sign in wit
 To sign in to Customers Portal using your GitLab.com account:
 
 1. Go to [Customers Portal](https://customers.gitlab.com/customers/sign_in).
-1. Select **Continue with your GitLab.com account**.
+1. Select **Continue with GitLab.com account**.
 
 To sign in to Customers Portal with your email and to receive a one-time sign-in link:
 

lib/gitlab/ci/jwt_v2.rb

@@ -5,11 +5,10 @@ module Ci
     class JwtV2 < Jwt
       include Gitlab::Utils::StrongMemoize
 
-      DEFAULT_AUD = Settings.gitlab.base_url
       GITLAB_HOSTED_RUNNER = 'gitlab-hosted'
       SELF_HOSTED_RUNNER = 'self-hosted'
 
-      def self.for_build(build, aud: DEFAULT_AUD, target_audience: nil)
+      def self.for_build(build, aud:, target_audience: nil)
         new(build, ttl: build.metadata_timeout, aud: aud, target_audience: target_audience).encoded
       end
 

spec/lib/gitlab/ci/jwt_v2_spec.rb

@@ -14,7 +14,7 @@
 
   let(:pipeline) { build_stubbed(:ci_pipeline, ref: 'auto-deploy-2020-03-19') }
   let(:runner) { build_stubbed(:ci_runner) }
-  let(:aud) { described_class::DEFAULT_AUD }
+  let(:aud) { nil }
   let(:target_audience) { nil }
 
   let(:build) do
@@ -49,7 +49,6 @@
     it 'has correct values for the standard JWT attributes' do
       aggregate_failures do
         expect(payload[:iss]).to eq(Gitlab.config.gitlab.url)
-        expect(payload[:aud]).to eq(Settings.gitlab.base_url)
         expect(payload[:sub]).to eq("project_path:#{project.full_path}:ref_type:branch:ref:#{pipeline.source_ref}")
       end
     end