Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes obsolete "Serbia and Montenegro" on civicrm_country.tpl #26328

Merged
merged 1 commit into from
Jun 2, 2023

Conversation

quimgil
Copy link
Contributor

@quimgil quimgil commented May 24, 2023

"Serbia and Montenegro" is still listed as common entity even if the ISO made a change separating both countries in 2006. "Serbia" and "Montenegro" are already listed with their correct ISO codes.

Overview

A brief description of the pull request. Keep technical jargon to a minimum. Hyperlink relevant discussions.

Before

What is the old user-interface or technical-contract (as appropriate)?
For optimal clarity, include a concrete example such as a screenshot, GIF (LICEcap, SilentCast), or code-snippet.

After

What changed? What is new old user-interface or technical-contract?
For optimal clarity, include a concrete example such as a screenshot, GIF (LICEcap, SilentCast), or code-snippet.

Technical Details

If the PR involves technical details/changes/considerations which would not be manifest to a casual developer skimming the above sections, please describe the details here.

Comments

Anything else you would like the reviewer to note

"Serbia and Montenegro" is still listed as common entity even if the ISO made a change separating both countries in 2006. "Serbia" and "Montenegro" are already listed with their correct ISO codes.
@civicrm-builder
Copy link

Can one of the admins verify this patch?

@civibot
Copy link

civibot bot commented May 24, 2023

(Standard links)

@civicrm-builder
Copy link

Can one of the admins verify this patch?

@civibot civibot bot added the master label May 24, 2023
@demeritcowboy
Copy link
Contributor

jenkins ok to test

@demeritcowboy
Copy link
Contributor

@totten @seamuslee001 does bknix-run-a1n5z9 have an older config/snapshot on it?

Test fail, but I don't think it's related to the PR:

CivicrmUpgradeTest.CivicrmUpgradeTest.4_6_36-setupsh_sql_bz2
In UpgradeDbCommand.php line 64:
                                                                               
  [Exception]                                                                  
  CiviCRM versions prior to 4.7.31 cannot be upgraded directly to 5.63.alpha1  
  . This upgrade will need to be done in stages. First download an intermedia  
  te version (the LTS may be a good choice) and upgrade to that before procee  
  ding to this version.    

Separately @quimgil this will also need to run regen.sh to update civicrm_generated.sql (can also run it online in your fork).

@demeritcowboy
Copy link
Contributor

jenkins retest this please

@demeritcowboy demeritcowboy merged commit 0225f2f into civicrm:master Jun 2, 2023
@demeritcowboy
Copy link
Contributor

I'll put the regen up separately.
@quimgil Can you make another PR to add yourself to https://github.com/civicrm/civicrm-core/blob/master/contributor-key.yml for release notes credit.

demeritcowboy added a commit to demeritcowboy/civicrm-core that referenced this pull request Jun 2, 2023
colemanw added a commit that referenced this pull request Jun 2, 2023
@quimgil
Copy link
Contributor Author

quimgil commented Jun 4, 2023

@demeritcowboy Thank you for accepting the patch. About the credits, it's ok. It's such a small patch and it was a colleague who noticed the duplication in the list. Let's leave it here. :)

demeritcowboy added a commit to demeritcowboy/civicrm-core that referenced this pull request Jun 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants