Commit 23333fef authored by Robert Speicher's avatar Robert Speicher

Merge branch 'country-korea-fix' into 'master'

Corrected name of North Korea in denylist of countries

See merge request gitlab-org/gitlab!16845
parents e9f09636 d8f189c5
...@@ -4,7 +4,7 @@ module World ...@@ -4,7 +4,7 @@ module World
include ::Gitlab::Utils::StrongMemoize include ::Gitlab::Utils::StrongMemoize
extend self extend self
DENYLIST = ['Iran (Islamic Republic of)', 'Sudan', 'Syrian Arab Republic', 'Korea', 'Democratic People\'s Republic of', 'Cuba'].freeze DENYLIST = ['Iran (Islamic Republic of)', 'Sudan', 'Syrian Arab Republic', 'Korea (Democratic People\'s Republic of)', 'Cuba'].freeze
def countries_for_select def countries_for_select
strong_memoize(:countries_for_select) { all_countries.sort_by(&:name).map { |c| [c.name, c.alpha2] } } strong_memoize(:countries_for_select) { all_countries.sort_by(&:name).map { |c| [c.name, c.alpha2] } }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment