Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: exclude files listed under exclusions #4686

Merged
merged 15 commits into from
Nov 2, 2020
Merged

fix: exclude files listed under exclusions #4686

merged 15 commits into from
Nov 2, 2020

Conversation

mayzhang2000
Copy link
Contributor

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I've signed the CLA and my build is green (troubleshooting builds).

@mayzhang2000 mayzhang2000 marked this pull request as draft October 28, 2020 16:10
@mayzhang2000 mayzhang2000 marked this pull request as ready for review October 29, 2020 00:06
@codecov-io
Copy link

codecov-io commented Oct 29, 2020 •
edited
Loading

Codecov Report

Merging #4686 into master will decrease coverage by 0.01%.
The diff coverage is 20.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4686      +/-   ##
==========================================
- Coverage   41.12%   41.11%   -0.02%     
==========================================
  Files         127      127              
  Lines       17521    17563      +42     
==========================================
+ Hits         7206     7221      +15     
- Misses       9285     9308      +23     
- Partials     1030     1034       +4
Impacted Files Coverage Δ
pkg/apis/application/v1alpha1/types.go 56.84% <ø> (ø)
cmd/argocd/commands/app.go 6.53% <10.00%> (+0.02%) ⬆️
util/argo/argo.go 58.72% <25.00%> (-0.60%) ⬇️
reposerver/repository/repository.go 59.76% <100.00%> (-1.18%) ⬇️
util/git/client.go 50.00% <0.00%> (+2.36%) ⬆️

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 97003ca...53385cf. Read the comment docs.

@mayzhang2000
Merge branch 'master' of github.com:argoproj/argo-cd into 4432_dotfiles
41144c1 
� Conflicts:
�	assets/swagger.json
�	cmd/argocd/commands/app.go
�	docs/user-guide/commands/argocd_app_create.md
�	docs/user-guide/commands/argocd_app_set.md
�	pkg/apis/application/v1alpha1/generated.pb.go
@mayzhang2000
fix: fix merge conflicts
0677e55
@mayzhang2000
fix: fix merge conflicts
ca5f4e2
@mayzhang2000
fix: fix merge conflicts
f84f362
alexmt
alexmt requested changes Oct 30, 2020
View reviewed changes
@mayzhang2000
use glob
6eb3560
@mayzhang2000
Merge branch 'master' of github.com:argoproj/argo-cd into 4432_dotfiles
20d67f2 
� Conflicts:
�	assets/swagger.json
�	pkg/apis/application/v1alpha1/generated.pb.go
@mayzhang2000
fix merge conflict
a47ccaa
alexmt
alexmt requested changes Oct 31, 2020
View reviewed changes
@mayzhang2000
fix rename the flag
0b5f611
@mayzhang2000
This is my commit message
519f559 
Signed-off-by: May Zhang <may_zhang@intuit.com>
@mayzhang2000
-s
53385cf
alexmt
alexmt approved these changes Nov 2, 2020
View reviewed changes
Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@mayzhang2000
Merge branch 'master' of github.com:argoproj/argo-cd into 4432_dotfiles
24f3c68 
� Conflicts:
�	test/e2e/app_management_test.go
@mayzhang2000 mayzhang2000 merged commit 6ef89e3 into argoproj:master Nov 2, 2020
@mayzhang2000
Copy link
Contributor Author

fixes #4432

terrycorley pushed a commit to terrycorley/argo-cd that referenced this pull request Nov 3, 2020
@terry-sm
Merge branch 'master' of github.com:argoproj/argo-cd into add-kustomi…
fed6f94 
…zation-generators

* 'master' of github.com:argoproj/argo-cd:
  fix: RevisionFormField component crashes in 'refs' API returns no tags (argoproj#4735)
  docs: add Opensurvey to USERS.md (argoproj#4727)
  docs: correct parameters usage in CLI (argoproj#4725)
  fix: Repo-server has silent unmarshalling errors leading to empty applications (argoproj#4423) (argoproj#4708)
  fix: inject artificial delay between sync waves to better support health assessments (argoproj#4715)
  fix: exclude files listed under exclusions (argoproj#4686)
  feat: support resource actions on CRDs that use status subresources (argoproj#4690)
  feat: Add autocomplete for repo Revisions (argoproj#4645) (argoproj#4713)
  fix: webhook don't refresh apps pointing to HEAD (argoproj#4717)
  feat: Add support for ExecProvider cluster auth (argoproj#4600) (argoproj#4710)
  fix: adding helm values file in New App (argoproj#4635)
  docs: Instructions on `make verify-kube-connect` step when using k3d (argoproj#4687)
  feat:  Annotation based app paths detection in webhooks (argoproj#4699)
  fix: adding commonAnnotations for Kustomize (argoproj#4613)
This was referenced Jan 3, 2021
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexmt alexmt alexmt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mayzhang2000 @codecov-io @alexmt