Skip to content
This repository has been archived by the owner on Feb 7, 2024. It is now read-only.

fix: use strategic merge patch to merge built-in and user provided config #74

Merged
merged 1 commit into from
Apr 17, 2020

Conversation

alexmt
Copy link
Collaborator

@alexmt alexmt commented Apr 17, 2020

Closes #69

@codecov
Copy link

codecov bot commented Apr 17, 2020

Codecov Report

Merging #74 into master will decrease coverage by 1.13%.
The diff coverage is 58.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #74      +/-   ##
==========================================
- Coverage   56.59%   55.45%   -1.14%     
==========================================
  Files          20       20              
  Lines        1009      990      -19     
==========================================
- Hits          571      549      -22     
- Misses        359      361       +2     
- Partials       79       80       +1     
Impacted Files Coverage Δ
notifiers/notifiers.go 0.00% <ø> (ø)
cmd/controller.go 32.75% <33.33%> (-0.58%) ⬇️
shared/settings/settings.go 72.88% <61.90%> (-8.37%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update be6206a...e5e01a8. Read the comment docs.

@alexmt alexmt merged commit 2c70eb0 into argoproj-labs:master Apr 17, 2020
@alexmt alexmt deleted the 69-strategic-merge-patch branch April 17, 2020 23:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Template webhook configuration value is not merged at runtime
1 participant