From 06ed0cda03804362598a1c3d9f7c670c9222d296 Mon Sep 17 00:00:00 2001
From: Aditya Menon <aditya.menon@spin.pm>
Date: Tue, 27 Jul 2021 13:07:07 +0200
Subject: [PATCH] fix(argo-cd): Deprecate the static assets flag passed to
 argocd-server (#846)

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Signed-off-by: thomascjohnson <thomascjohnson@gmail.com>
---
 charts/argo-cd/Chart.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 87e252a8..8de9679f 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -21,4 +21,9 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
+<<<<<<< HEAD
     - "[Changed]: Set server.staticAssets.enabled=true since Argo CD 2.0.5 still needs it"
+=======
+    - "[Added]: Support AWS ALB Ingress with gRPC"
+    - "[Deprecated]: Deprecate static assets flag passed to argocd-server"
+>>>>>>> fix(argo-cd): Deprecate the static assets flag passed to argocd-server (#846)