From 516961474bcb3eeb012f854d2217aa6cb48951e2 Mon Sep 17 00:00:00 2001 From: swcraig Date: Thu, 30 Nov 2017 08:51:06 -0800 Subject: [PATCH 1/2] Update CHANGELOG to reflect changes from #247 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c11d9d4a..071ebb3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ### master (unreleased) +##### Geographic Modifications +* [#247](https://github.com/carmen-ruby/carmen/pull/247) Fix New Zealand regions + to match 2015-11-27 ISO correction ([@louim](https://github.com/louim)) + ### 1.1.0 (November 7, 2017) * [#231](https://github.com/carmen-ruby/carmen/pull/231) Base ISO data has been updated for the first time since October 25, 2014 * [#233](https://github.com/carmen-ruby/carmen/pull/233) Revert removing Puerto Rico as a country code From 8bd6939602a6347b044f07e63012641fb55408a3 Mon Sep 17 00:00:00 2001 From: swcraig Date: Thu, 30 Nov 2017 09:23:40 -0800 Subject: [PATCH 2/2] Add PR template Includes a (polite) instruction to add a CHANGELOG entry for the PR. --- .github/PULL_REQUEST_TEMPLATE.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..0294383e --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,11 @@ +For non-trivial PRs, please add an entry to the CHANGELOG (following the convention in place). + +If the changes are geography related (overlay/locale modifications) place the entry under "Geographic Modifications". + +Please follow this format _exactly_: + +`[#] ([@]())` + +------------------------------------------ + +**Please remove the text in this template before submitting your Pull Request**