Skip to content

Conversation

@dani-garcia
Copy link
Member

🎟️ Tracking

📔 Objective

The merge of #414 and #413 has created some conflicts leading to the main branch not building anymore. This PR should fix that.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation
    team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

@dani-garcia dani-garcia requested a review from a team as a code owner September 3, 2025 13:51
@sonarqubecloud
Copy link

sonarqubecloud bot commented Sep 3, 2025

@github-actions
Copy link
Contributor

github-actions bot commented Sep 3, 2025

Logo
Checkmarx One – Scan Summary & Detailsf80bb0bd-2c0b-483e-9901-500dad0f576c

Great job! No new security vulnerabilities introduced in this pull request

@codecov
Copy link

codecov bot commented Sep 3, 2025

Codecov Report

❌ Patch coverage is 91.30435% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 76.91%. Comparing base (7b5d9db) to head (cc0212e).
⚠️ Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
crates/bitwarden-exporters/src/cxf/identity.rs 91.30% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #423      +/-   ##
==========================================
- Coverage   76.94%   76.91%   -0.03%     
==========================================
  Files         266      266              
  Lines       25066    25181     +115     
==========================================
+ Hits        19287    19368      +81     
- Misses       5779     5813      +34     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@dani-garcia dani-garcia merged commit 10d2ff5 into main Sep 3, 2025
50 checks passed
@dani-garcia dani-garcia deleted the ps/fix-cxf-conflict branch September 3, 2025 14:07
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.

3 participants