Skip to content

Update Country field to Country/Region, including name for Taiwan

Ross Byrne requested to merge 349333-update-country-field into master

What does this MR do and why?

What

On the Free/Trial Registrations pages, the following changes are made:

  • Change Country field title
    • Old value: Country
    • New value: Country / Region
  • Update dropdown select value within the Country / Region
    • Old value: Taiwan, Province of China
    • New value: Taiwan

The changes related to changing the country name for Taiwan are based on this discussion: https://gitlab.com/gitlab-org/gitlab/-/issues/349333#note_1245028669.

Why

Based on the issue: https://gitlab.com/gitlab-org/gitlab/-/issues/349333

Currently, our free registration and trial registration pages indicate Taiwan is a province of China. The purpose of this issue to update this field to support both countries and regions without calling territorial claims.

Screenshots or screen recordings

Free Registrations

https://gitlab.com/users/sign_up/company/new

Before After
Screenshot_2023-02-09_at_17.29.27 Screenshot_2023-02-09_at_17.23.17
Screenshot_2023-02-09_at_17.30.34 Screenshot_2023-02-09_at_17.23.37

Trial Registrations

https://gitlab.com/-/trials/new

Before After
Screenshot_2023-02-09_at_17.31.14 Screenshot_2023-02-09_at_17.23.52
Screenshot_2023-02-09_at_17.31.28 Screenshot_2023-02-09_at_17.24.04

How to set up and validate locally

  1. Setup your local GDK to simulate a SAAS instance.
  2. Navigate to the following URLs:
    • http://127.0.0.1:3000/users/sign_up/company/new
    • http://127.0.0.1:3000/-/trials/new
  3. Confirm Country fields have been updated, along with the country name for Taiwan.

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 #349333

Edited by Ross Byrne

Merge request reports