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.

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

fix: bad merge #14759

Merged
merged 1 commit into from
Jul 27, 2023
Merged

fix: bad merge #14759

merged 1 commit into from
Jul 27, 2023

Conversation

crenshaw-dev
Copy link
Collaborator

Looks like a cherry-pick missed something.

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@codecov
Copy link

codecov bot commented Jul 27, 2023

Codecov Report

Patch coverage: 66.27% and no project coverage change.

Comparison is base (826a11f) 49.80% compared to head (5d70782) 49.81%.
Report is 7 commits behind head on release-2.8.

Additional details and impacted files
@@             Coverage Diff              @@
##           release-2.8   #14759   +/-   ##
============================================
  Coverage        49.80%   49.81%           
============================================
  Files              261      261           
  Lines            44865    44884   +19     
============================================
+ Hits             22347    22359   +12     
- Misses           20314    20320    +6     
- Partials          2204     2205    +1     
Files Changed Coverage Δ
reposerver/repository/repository.go 59.33% <20.00%> (+0.03%) ⬆️
server/server.go 55.04% <33.33%> (ø)
controller/appcontroller.go 54.03% <70.90%> (+0.08%) ⬆️
util/kube/kube.go 71.54% <82.35%> (-1.34%) ⬇️
util/dex/config.go 85.85% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@alexmt alexmt merged commit 40fda39 into release-2.8 Jul 27, 2023
19 of 21 checks passed
@alexmt alexmt deleted the fix-bad-merge branch July 27, 2023 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants