Skip to content

Commit

Permalink
Merge pull request #161 from Financial-Times/matth/quick-housekeeping
Browse files Browse the repository at this point in the history
Quick housekeeping
  • Loading branch information
i-like-robots authored Sep 7, 2018
2 parents 6d4684a + 5f49b41 commit f6a3921
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ references:
#
create_cache_root: &create_cache_root
save_cache:
key: cache-root-v1-{{ .Branch }}-{{ checksum "./package-lock.json" }}
key: cache-root-v1-{{ .Branch }}-{{ checksum "./package.json" }}
paths:
- ./node_modules/

create_cache_docs: &create_cache_docs
save_cache:
key: cache-docs-v1-{{ .Branch }}-{{ checksum "./tools/x-docs/package-lock.json" }}
key: cache-docs-v1-{{ .Branch }}-{{ checksum "./tools/x-docs/package.json" }}
paths:
- ./tools/x-docs/node_modules/

create_cache_workbench: &create_cache_workbench
save_cache:
key: cache-workbench-v1-{{ .Branch }}-{{ checksum "./tools/x-workbench/package-lock.json" }}
key: cache-workbench-v1-{{ .Branch }}-{{ checksum "./tools/x-workbench/package.json" }}
paths:
- ./tools/x-workbench/node_modules/

Expand Down
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

## v1

### v1.0.0-beta.3

- Removes whitespace output around text output in x-teaser (#146)
- Refactors headshot prop to accept a string value in x-teaser (#153)
- Refactors theme indicator and theme rule to enable explicit overrides in x-teaser (#154)
- Adds parentTheme prop to x-teaser (#154)


### v1.0.0-beta.2

- Adds support for fragments to x-engine (#134)
Expand Down

0 comments on commit f6a3921

Please sign in to comment.