Skip to content

Do not show blocked states

Bishwa Hang Rai requested to merge 374946-exclude-regions-in-ukraine into master

What does this MR do and why?

This MR adds a deny list of states for a country, that can be updated in order to not show those blocked states.

For now, we are denying the three regions of Ukraine: The Crimea, Donetsk, and Luhansk.

Screenshots or screen recordings

  1. Billing Page on Subscription buy

Screen_Recording_2022-09-29_at_18.08.32

  1. New User log in with trial page

Screen_Recording_2022-09-29_at_21.51.12

  1. Trial Page directly via url: http://gdk.test:3000/-/trials/new

Screen_Recording_2022-09-29_at_22.02.17

How to set up and validate locally

Billing page when buying subscriptions

  1. Checkout this branch
  2. Run the Gitlab and Customers-Dot server locally
  3. Go to Gitlab page locally and create a new group
  4. For the newly created group, go to Settings -> Billing and Click on Upgrade (Ultimate SaaS plan) button
  5. On the Subscription buying page, click Continue to Billing
  6. On the billing page, look for Ukraine in Country select list
  7. You should see Ukraine (except the Crimea, Donetsk, and Luhansk regions)
  8. Once you select Ukraine (except the Crimea, Donetsk, and Luhansk regions) for country, click on States select list
  9. These 3 states should not be listed for selection: ["Donets'ka Oblast'", "Luhans'ka Oblast'", "Respublika Krym"]
  10. Proceed further and the purchase should function without error

New user joining as "My company or team"

  1. Create a new user
  2. Login with the credentials
  3. Select "Who will be using GitLab" with "My company or team".
  4. Select "What would you like to do?" with "Create a new project"
  5. Continue and fill up "Group name" and "Project name" and continue
  6. You will see a "Start your Free Ultimate Trial" page
  7. In the country select list you will see: Ukraine (except the Crimea, Donetsk, and Luhansk regions)
  8. Proceed further and the new user welcome steps should function without error

Directly going to trial page

  1. Login and go to url: http://gdk.test:3000/-/trials/new
  2. You will see the Country select list and Ukraine (except the Crimea, Donetsk, and Luhansk regions)
  3. Proceed further and the trial should function without error

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Related to #374946 (closed)

Edited by Bishwa Hang Rai

Merge request reports