Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 2 insertions, 6 deletions

diff --git a/lib/gitlab/subscription_portal.rb b/lib/gitlab/subscription_portal.rb
index 9b6bae12057..4f6d25097e2 100644
--- a/lib/gitlab/subscription_portal.rb
+++ b/lib/gitlab/subscription_portal.rb
@@ -4,11 +4,7 @@ module Gitlab
   module SubscriptionPortal
     def self.default_subscriptions_url
       if ::Gitlab.dev_or_test_env?
-        if Feature.enabled?(:new_customersdot_staging_url, default_enabled: :yaml)
-          'https://customers.staging.gitlab.com'
-        else
-          'https://customers.stg.gitlab.com'
-        end
+        'https://customers.staging.gitlab.com'
       else
         'https://customers.gitlab.com'
       end
@@ -43,7 +39,7 @@ module Gitlab
     end
 
     def self.subscriptions_plans_url
-      "#{self.subscriptions_url}/plans"
+      Gitlab::Saas.about_pricing_url
     end
 
     def self.subscriptions_gitlab_plans_url