Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 29 insertions, 1 deletions

diff --git a/lib/gitlab/subscription_portal.rb b/lib/gitlab/subscription_portal.rb
index 78fa5009bc4..9b6bae12057 100644
--- a/lib/gitlab/subscription_portal.rb
+++ b/lib/gitlab/subscription_portal.rb
@@ -3,7 +3,15 @@
 module Gitlab
   module SubscriptionPortal
     def self.default_subscriptions_url
-      ::Gitlab.dev_or_test_env? ? 'https://customers.stg.gitlab.com' : 'https://customers.gitlab.com'
+      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
+      else
+        'https://customers.gitlab.com'
+      end
     end
 
     def self.subscriptions_url
@@ -38,6 +46,26 @@ module Gitlab
       "#{self.subscriptions_url}/plans"
     end
 
+    def self.subscriptions_gitlab_plans_url
+      "#{self.subscriptions_url}/gitlab_plans"
+    end
+
+    def self.subscriptions_instance_review_url
+      "#{self.subscriptions_url}/instance_review"
+    end
+
+    def self.add_extra_seats_url(group_id)
+      "#{self.subscriptions_url}/gitlab/namespaces/#{group_id}/extra_seats"
+    end
+
+    def self.upgrade_subscription_url(group_id, plan_id)
+      "#{self.subscriptions_url}/gitlab/namespaces/#{group_id}/upgrade/#{plan_id}"
+    end
+
+    def self.renew_subscription_url(group_id)
+      "#{self.subscriptions_url}/gitlab/namespaces/#{group_id}/renew"
+    end
+
     def self.subscription_portal_admin_email
       ENV.fetch('SUBSCRIPTION_PORTAL_ADMIN_EMAIL', 'gl_com_api@gitlab.com')
     end