Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into feat-custom-is-ignored
  • Loading branch information
marionebl authored Apr 26, 2019
commit cc2e4c74e29a6b2b628e0b66f0bf3ac928875a36
3 changes: 2 additions & 1 deletion @commitlint/load/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const valid = input =>
input,
'extends',
'rules',
'plugins',
'parserPreset',
'formatter',
'ignoredMessages',
Expand All @@ -26,7 +27,7 @@ export default async (seed = {}, options = {cwd: process.cwd()}) => {
const config = valid(merge(loaded.config, seed));
const opts = merge(
{extends: [], rules: {}, formatter: '@commitlint/format'},
pick(config, 'extends', 'ignoredMessages', 'disableDefaultIgnoredMessages')
pick(config, 'extends', 'plugins', 'ignoredMessages', 'disableDefaultIgnoredMessages')
);

// Resolve parserPreset key
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.