Skip to content

Fix/conflicts back merge main#92

Merged
harshitha-cstk merged 68 commits intov2-betafrom
fix/conflicts-back-merge-main
Apr 17, 2026
Merged

Fix/conflicts back merge main#92
harshitha-cstk merged 68 commits intov2-betafrom
fix/conflicts-back-merge-main

Conversation

@harshitha-cstk
Copy link
Copy Markdown
Contributor

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

No description provided.

cs-raj and others added 30 commits February 23, 2026 20:35
@cs-raj
feat(audit): validate referenced entry content types in entries audit
3935cb3
@cs-raj
Remove Redundant code block
ad98bea
@cs-raj
Merge pull request #2423 from contentstack/feat/DX-3800
c9b1a38 
feat(audit): validate referenced entry content types in entries audit
@cs-raj
fix: Skipping lytics audience creation
a2b3040
@cs-raj
fix(personalize): filter lytics audiences in experience variants duri…
a0dbaf5 
…ng import
@cs-raj
Merge pull request #2427 from contentstack/fix/DX-3445
6e88515 
DX - 3445  Experience import errors when variants reference Lytics audiences
@shafeeqd959
added workflows and scripts
1ec096d
@shafeeqd959
updated release workflow
8ae7a27
@shafeeqd959
merged git workflow changes
3aab1af
@shafeeqd959
disabled the beta release
1227ad1
@shafeeqd959
Merge pull request #2 from contentstack/v1-dev
eeed14c 
Modularised repo changes v1
@shafeeqd959
enabled the beta release
a7a6b49
@Aravind-Kumar-cstk
Delete CODEOWNERS
9e7984e
@Aravind-Kumar-cstk
Update policy-scan.yml
a33fce9
@Aravind-Kumar-cstk
Merge pull request #5 from contentstack/v1-beta
1281c3f 
V1 beta
@shafeeqd959
updated clean script
0a41a86
@shafeeqd959
updated clean packages
4f34260
@shafeeqd959
added oclif manifest in the build script
fbd7687
@shafeeqd959
added update lock file script
592f465
@sunil-lakshman
Fixed seed command for existing stack
60d07ef
@sunil-lakshman
updated importer file
5309da2
@shafeeqd959
bumped dev dependency
46073b2
@shafeeqd959
updated scripts and release yml
464beed
@shafeeqd959
Merge pull request #6 from contentstack/v1-dev
3339b41 
Modularised repo changes for beta v1
@shafeeqd959
updated scripts and release yml
d03658d
@shafeeqd959
Merge branch 'v1-dev' into v1-beta
0229932
@shafeeqd959
updated release yml
601dec9
@sunil-lakshman
Fixed merge conflits
a50257d
@sunil-lakshman
Merge pull request #10 from contentstack/fix/enh-4442
82266e0 
Fixed seed command for existing stack
feat: add support for assets in custom roles
2baaded
harshitha-cstk and others added 15 commits March 30, 2026 17:08
@harshitha-cstk
update lockfile
c32cb32
@harshitha-cstk
update brace-expansion to version 5.0.5 in lockfile and workspace con…
b9ccc1b 
…figuration
@dhaval-jain-cstk
Update README.md
1d6461f
@Madhuri-cs
Update README.md
2282ebe
@shafeeqd959
Merge pull request #57 from contentstack/next-release
827e5ee 
Next release
@shafeeqd959
Merge pull request #62 from contentstack/fix/back-merge
b5815a0 
Fix/back merge
@shafeeqd959
added cursor files
af54f54
@shafeeqd959
reverted inquirer + overrided loadash
fbb6180
@shafeeqd959
bumped versions
9b9ae37
@shafeeqd959
Merge pull request #53 from contentstack/v1-cursor-rules-update
edd6412 
added cursor rules
@harshitha-cstk
Merge pull request #78 from contentstack/development
7fbf559 
DX | 06-04-2026 | Release
chore: fixed script
aa6e8bc
@naman-contentstack
Merge pull request #81 from contentstack/chore/fix-script
b206321 
chore: fixed script
@shafeeqd959
Merge pull request #82 from contentstack/development
9223672 
script changes
@harshitha-cstk
Merge branch 'main' into fix/conflicts-back-merge-main
289124d
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 17, 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 0 0 10 ✅ Passed
🟠 High Severity 0 0 25 ✅ Passed
🟡 Medium Severity 0 29 500 ✅ Passed
🔵 Low Severity 0 0 1000 ✅ Passed

⏱️ SLA Breach Summary

✅ No SLA breaches detected. All vulnerabilities are within acceptable time thresholds.

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 0 90 / 365 days ✅ Passed
🔵 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: 0
  • High without fixes: 0
  • Medium without fixes: 29
  • Low without fixes: 0

✅ BUILD PASSED - All security checks passed

cs-raj
cs-raj previously approved these changes Apr 17, 2026
View reviewed changes
@harshitha-cstk harshitha-cstk requested a review from a team as a code owner April 17, 2026 10:28
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 17, 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 0 0 10 ✅ Passed
🟠 High Severity 0 0 25 ✅ Passed
🟡 Medium Severity 0 29 500 ✅ Passed
🔵 Low Severity 0 0 1000 ✅ Passed

⏱️ SLA Breach Summary

✅ No SLA breaches detected. All vulnerabilities are within acceptable time thresholds.

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 0 90 / 365 days ✅ Passed
🔵 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: 0
  • High without fixes: 0
  • Medium without fixes: 29
  • Low without fixes: 0

✅ BUILD PASSED - All security checks passed

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 17, 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 0 0 10 ✅ Passed
🟠 High Severity 0 0 25 ✅ Passed
🟡 Medium Severity 0 29 500 ✅ Passed
🔵 Low Severity 0 0 1000 ✅ Passed

⏱️ SLA Breach Summary

✅ No SLA breaches detected. All vulnerabilities are within acceptable time thresholds.

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 0 90 / 365 days ✅ Passed
🔵 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: 0
  • High without fixes: 0
  • Medium without fixes: 29
  • Low without fixes: 0

✅ BUILD PASSED - All security checks passed

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 17, 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 0 0 10 ✅ Passed
🟠 High Severity 0 0 25 ✅ Passed
🟡 Medium Severity 0 29 500 ✅ Passed
🔵 Low Severity 0 0 1000 ✅ Passed

⏱️ SLA Breach Summary

✅ No SLA breaches detected. All vulnerabilities are within acceptable time thresholds.

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 0 90 / 365 days ✅ Passed
🔵 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: 0
  • High without fixes: 0
  • Medium without fixes: 29
  • Low without fixes: 0

✅ BUILD PASSED - All security checks passed

sunil-lakshman
sunil-lakshman approved these changes Apr 17, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@sunil-lakshman sunil-lakshman left a comment

Choose a reason for hiding this comment

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

LGTM

@harshitha-cstk harshitha-cstk merged commit 7e82abc into v2-beta Apr 17, 2026
9 checks passed
@harshitha-cstk harshitha-cstk deleted the fix/conflicts-back-merge-main branch April 17, 2026 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sunil-lakshman sunil-lakshman sunil-lakshman approved these changes

@cs-raj cs-raj cs-raj 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.

8 participants

@harshitha-cstk @sunil-lakshman @cs-raj @shafeeqd959 @Aravind-Kumar-cstk @naman-contentstack @dhaval-jain-cstk @Madhuri-cs