Skip to content

Fix/merge conflicts main#2523

Closed
harshitha-cstk wants to merge 141 commits intov2-betafrom
fix/merge-conflicts-main
Closed

Fix/merge conflicts main#2523
harshitha-cstk wants to merge 141 commits intov2-betafrom
fix/merge-conflicts-main

Conversation

@harshitha-cstk
Copy link
Copy Markdown
Contributor

@harshitha-cstk harshitha-cstk commented Apr 16, 2026

No description provided.

shafeeqd959 and others added 30 commits February 26, 2026 17:17
@shafeeqd959
removed plugins and updated workflows
41fe965
@shafeeqd959
updated installation script
760d652
@shafeeqd959
update unit test workflow
9b9db77
@shafeeqd959
update unit test workflow
36810a1
@shafeeqd959
updated workflows
e6af960
@shafeeqd959
updated release flow
5cf2d0f
@shafeeqd959
fixed unit test cases
9fa8a75
@harshithad0703
Merge pull request #2439 from contentstack/main
dd85f63 
back merge
@shafeeqd959
updated clean script
d9ee237
@shafeeqd959
updated build with oclif manifest
a39f041
@shafeeqd959
added update lock file script
7615b9c
@harshitha-cstk
Merge branch 'main' into fix/dx-4439-v1-dev-interactive-mode-messages
8b96701
@harshitha-cstk
fix(dx-4439): show human-readable prompts after command correction
4808903
@harshitha-cstk
fix(auth): show 'Log out cancelled' when user declines logout confirm…
d46be3d 
…ation
@netrajpatel
Updated topic descriptions for config commands
f9d39a5
@harshitha-cstk
auth version bump
a83c54b
@harshitha-cstk
update pnpm lock
2e9e5cc
@netrajpatel
Updated command descriptions and package versions
f66582b
@aravindbuilt
Merge branch 'main' into development
2c98c0c
@shafeeqd959
update unit test workflow
ec8d622
@shafeeqd959
updated config test script
f955291
@shafeeqd959
updated config test script
b19d6e1
@shafeeqd959
update tesconfig
41de899
@shafeeqd959
update tesconfig
2047e3f
@shafeeqd959
fixed test cases
c21518c
@shafeeqd959
fixed test cases
2c27390
@shafeeqd959
fixed test cases
f205c57
@shafeeqd959
fixed test cases
78a15a9
@shafeeqd959
update unit testcase yml
35f9dcd
@shafeeqd959
updated unit testcase yml
652ca0c
shafeeqd959 and others added 27 commits March 27, 2026 09:58
@shafeeqd959
Merge pull request #2499 from contentstack/development
ae40ec9 
Next Release
@sunil-lakshman
Added NO_PROXY env support
d0338ec
@sunil-lakshman
fix: updated brace-expansion version bump
cad030f
@sunil-lakshman
Merge pull request #2503 from contentstack/enh/dx-5343-proxy-staging
a9686c5 
Added NO_PROXY env support
@harshitha-cstk
Merge pull request #2500 from contentstack/staging
29df67c 
Staging
@shafeeqd959
removed dev dependency pkg from release pipeline
4b39465
@shafeeqd959
Merge pull request #2505 from contentstack/fix-release-pipeline
873e5a5 
removed dev dependency pkg from release pipeline
@harshitha-cstk
Merge pull request #2506 from contentstack/staging
d643326 
Staging
@shafeeqd959
bumped core version
54aa9bb
@harshitha-cstk
Merge pull request #2507 from contentstack/bump-core-version
3b672f9 
bumped core version
@harshitha-cstk
Merge pull request #2508 from contentstack/staging
24e4651 
DX | 30-03-2026 | Release
@harshitha-cstk
Merge pull request #2510 from contentstack/main
c4abce7 
back merge
@harshitha-cstk
Merge pull request #2509 from contentstack/main
3ff93e9 
back merge
@shafeeqd959
merged latest changes
7b422b2
@shafeeqd959
reverted inquirer
6789465
@shafeeqd959
overrided loadash
8f173a4
@shafeeqd959
bumped versions
690234c
@shafeeqd959
Merge pull request #2493 from contentstack/v1-cursor-rules-update
ba44e31 
chore: update Cursor rules and commands for modularized CLI
@harshitha-cstk
version bump
1735e87
@harshitha-cstk
pnpm lock update
c3e71af
@harshitha-cstk
Merge branch 'staging' into fix/version-bump2
048cccb 
:wq
@harshitha-cstk
version bump
f7556ae
@harshitha-cstk
version bump
b8049c4
@harshitha-cstk
Merge pull request #2511 from contentstack/fix/version-bump2
97ce43d 
version bump
@harshitha-cstk
Merge pull request #2512 from contentstack/development
9618c37 
staging PR
@harshitha-cstk
Merge pull request #2515 from contentstack/staging
8169a26 
DX | 06-04-2026 | Release
@harshitha-cstk
Merge branch 'main' into fix/merge-conflicts-main
1ffbfe3
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 16, 2026

🔒 Security Scan Results

ℹ️ Note: Only vulnerabilities with available fixes (upgrades or patches) are counted toward thresholds.

Check Type Count (with fixes) Without fixes Threshold Result
🔴 Critical Severity 13 84 10 ❌ Failed
🟠 High Severity 13 84 25 ✅ Passed
🟡 Medium Severity 7 62 500 ✅ Passed
🔵 Low Severity 0 0 1000 ✅ Passed

⏱️ SLA Breach Summary

⚠️ Warning: The following vulnerabilities have exceeded their SLA thresholds (days since publication).

Severity Breaches (with fixes) Breaches (no fixes) SLA Threshold (with/no fixes) Status
🔴 Critical 0 0 15 / 30 days ✅ Passed
🟠 High 0 0 30 / 120 days ✅ Passed
🟡 Medium 0 1 90 / 365 days ⚠️ Warning
🔵 Low 0 0 180 / 365 days ✅ Passed

ℹ️ Vulnerabilities Without Available Fixes (Informational Only)

The following vulnerabilities were detected but do not have fixes available (no upgrade or patch). These are excluded from failure thresholds:

  • Critical without fixes: 84
  • High without fixes: 84
  • Medium without fixes: 62
  • Low without fixes: 0

❌ BUILD FAILED - Security checks failed

Please review and fix the security vulnerabilities before merging.

1 similar comment
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 16, 2026

🔒 Security Scan Results

ℹ️ Note: Only vulnerabilities with available fixes (upgrades or patches) are counted toward thresholds.

Check Type Count (with fixes) Without fixes Threshold Result
🔴 Critical Severity 13 84 10 ❌ Failed
🟠 High Severity 13 84 25 ✅ Passed
🟡 Medium Severity 7 62 500 ✅ Passed
🔵 Low Severity 0 0 1000 ✅ Passed

⏱️ SLA Breach Summary

⚠️ Warning: The following vulnerabilities have exceeded their SLA thresholds (days since publication).

Severity Breaches (with fixes) Breaches (no fixes) SLA Threshold (with/no fixes) Status
🔴 Critical 0 0 15 / 30 days ✅ Passed
🟠 High 0 0 30 / 120 days ✅ Passed
🟡 Medium 0 1 90 / 365 days ⚠️ Warning
🔵 Low 0 0 180 / 365 days ✅ Passed

ℹ️ Vulnerabilities Without Available Fixes (Informational Only)

The following vulnerabilities were detected but do not have fixes available (no upgrade or patch). These are excluded from failure thresholds:

  • Critical without fixes: 84
  • High without fixes: 84
  • Medium without fixes: 62
  • Low without fixes: 0

❌ BUILD FAILED - Security checks failed

Please review and fix the security vulnerabilities before merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@harshitha-cstk @shafeeqd959 @harshithad0703 @netrajpatel @aravindbuilt @naman-contentstack @sunil-lakshman @cs-raj