Skip to content

Commit

Permalink
Merge pull request #500 from massgov/master
Browse files Browse the repository at this point in the history
Master
  • Loading branch information
clairesunstudio committed Mar 6, 2019
2 parents 1103bc4 + 4867bb7 commit 9015090
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 37 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,25 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
**For example**
- DP-1234: The short description text on a [service detail](http://mayflower.digital.mass.gov/?p=pages-detail-for-service-howto-location) page banner ([@organisms/by-template/page-banner](http://mayflower.digital.mass.gov/?p=organisms-page-banner)) should now render ([PR #493](https://github.com/massgov/mayflower/pull/493))

## 9.2.0 (05/05/2019)

### Added
- (Patternlab) [Header] DP-4562: Set focus state for search on mobile menu in mobileNav module. #473
- (React) [HelpTip] DP-12875: Add `disabled` prop to disable HelpTip trigger text. #494

### Fixed
- (React) [InputSlider] DP-12732: Allows slider callback and updates form context on handler drag (Added onUpdate prop) #495
- (React) [InputSlider] DP-12732: Allows keyboard actions and slider track click to update value (Changed handleChange from using onSlideEnd to onChange) #495
- (React) [InputCurrency] DP-12807: Prevent InputCurrency returning NaN when default value is set to null #484
- (React) [ErrorMessage] DP-12806: Fix error message inline styling #484
- (React) [InputSlider] DP-12875: Disable handle button when InputSlider is disabled. #494
- (React) [InputCurrency] DP-12890: Fix `NaN` value when defaultValue is null using up/down buttons. #498

### Changed
- (Patternlab) [SectionLinks] DP-9249: Topic card more links #472
- (React) [InputCurrency] DP-12890: Pass event type to callback #498


## 9.1.1 (02/19/2019)

### Fixed
Expand Down
5 changes: 0 additions & 5 deletions changelogs/DP-12807.txt

This file was deleted.

8 changes: 0 additions & 8 deletions changelogs/DP-12875.txt

This file was deleted.

4 changes: 0 additions & 4 deletions changelogs/DP-12890.md

This file was deleted.

5 changes: 0 additions & 5 deletions changelogs/DP-4562.txt

This file was deleted.

6 changes: 0 additions & 6 deletions changelogs/DP-9249.txt

This file was deleted.

15 changes: 13 additions & 2 deletions changelogs/template.txt → changelogs/template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
___EXAMPLE___
Minor
Added
- (Patternlab) [Header] DP-4562: Set focus state for search on mobile menu in mobileNav module #473
- (React) [HelpTip] DP-12875: Add `disabled` prop to disable HelpTip trigger text. #494

___DESCRIPTION___
Change_type (see below)
Change_impact (see below)
- (Project_prefix) DP-1234: Adds apples to apple trees for admin apple pickers #PR#
Change_type (see below)
- (Project_prefix) [ComponentName] DP-1234: Adds apples to apple trees for admin apple pickers #PR

___POST DEPLOY STEPS___
1. Do this
Expand All @@ -28,3 +34,8 @@ ___PROJECTS PREFIX___
- Patternlab
- React
- Docs


___COMPONENT NAME___
Component name in `PascalCase`
e.g. Header, Form, InputSlider, InputTextTypeAhead
16 changes: 9 additions & 7 deletions docs/for-developers/changelog-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@ This documentation outlines a simple series of steps to keep `CHANGELOG.md` up-t

## Dev: Before You Submit a PR for a Feature Branch or Hot Fix

1. Make a copy of `changelogs/template.txt` with the ticket number as the name \(example: `DP-1234.txt`\). If there is no ticket number for the contribution, just use the branch name and your initials \(`awesome- feature-branch.txt`\).
2. Write a plain language description of the feature you're contributing. It needs to include the name, what changed, and who it impacts.
3. Write down any post deploy steps that need to be performed \(Examples: `This change will effect the local build. Make sure all developers know what steps to take after this gets in to dev`\).
4. Commit the file and open your PR.
1. Make a copy of `changelogs/template.md` with the ticket number as the name, e.g. `DP-1234.md.` If there is no ticket number for the contribution, just use the branch name and your initials, e.g. `awesome- feature-branch.md`.
2. Write a plain language description of the feature you're contributing. It needs to include the project prefix, component name, what changed, and who it impacts.
3. Write down any post deploy steps that need to be performed, e.g.
> This change will effect the local build. Make sure all developers know what steps to take after this gets in to dev.
4. For any breaking changes, add a comment in the PR describing the necessary changes on the consumer side and link that comment in the changelog.
5. Commit the file and open your PR.

## Release Master: When you are Releasing

Do this after your open your release branch:

1. In `CHANGELOG.md`, create a new section for the release with "Added", "Changed", and "Removed" sub-sections.
2. Go through each `changelogs/*.txt` file and copy the description into the appropriate sub-section of `CHANGELOG.md`.
2. Go through each `changelogs/*.md` file and copy the description into the appropriate sub-section of `CHANGELOG.md`.
3. Keep a list of post deployment steps handy for yourself.
4. After the last description is copied and you have all the post deployment steps, delete all files in `changelogs/` except for `changelogs/template.txt.`
4. After the last description is copied and you have all the post deployment steps, delete all files in `changelogs/` except for `changelogs/template.md`.
5. Commit changes to the release branch.

0 comments on commit 9015090

Please sign in to comment.