Skip to content

Fix/hotfix back merge from stagingconflicts #75

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 25 commits into from
May 23, 2025
Merged

Fix/hotfix back merge from stagingconflicts #75

merged 25 commits into from
May 23, 2025

Conversation

harshithad0703
Copy link
Contributor

No description provided.

cs-raj and others added 24 commits March 11, 2025 18:12
@cs-raj
Merge pull request #63 from contentstack/staging
76f92fd 
DX | 10-03-2025 | Release
@aravindbuilt
policy-scan.yml
3acf750
@aravindbuilt
issues-jira.yml
bcd8bcc
@aravindbuilt
Delete jira.yml
513a452
@aravindbuilt
Delete sast-scan.yml
4d4f84c
@aravindbuilt
Updated codeowners
3417115
@aravindbuilt
policy-scan.yml
dc14a7c
@aravindbuilt
policy-scan.yml
3debdf6
@aravindbuilt
issues-jira.yml
5f79a9c
@aravindbuilt
secrets-scan.yml
12e5929
@aravindbuilt
Updated codeowners
db015fa
@aravindbuilt
talismanrc file updated
ad5bcea
@harshithad0703
Update base URL path logic in contentstackClient to handle when regio…
8b8a8ad 
…n and host not provided
@harshithad0703
Bump version to 1.3.0 and update axios dependency to 1.8.3; fix encod…
93376ba 
…ing in sanity report file read
@harshithad0703
Fix encoding in mochawesome report file read and include region in Sl…
c53a93e 
…ack message header
@harshithad0703
Update CHANGELOG for v1.3.0
90774fe
@harshithad0703
update unit test cases
a9178cd
@harshithad0703
Add region-specific login tests for Contentstack Client
13ddc62
@harshithad0703
Update version to 1.2.7 in package.json, package-lock.json, and CHANG…
6e36896 
…ELOG; modify region variable in sanity-report.mjs
@harshithad0703
add optional chaining for http.defaults.host in contentstackClient
fe4e668
@harshithad0703
Merge pull request #72 from contentstack/hotfix/region-support-fix
ba565f6 
Hotfix/region support fix
@harshithad0703
fix: update checksum for package-lock.json in .talismanrc
4597674
@harshithad0703
Merge pull request #74 from contentstack/fix/talisman-check
868d984 
fix: update checksum for package-lock.json in .talismanrc
@harshithad0703
Merge branch 'staging' into fix/merge-conflicts
5a0f10d
@harshithad0703 harshithad0703 requested a review from a team as a code owner May 23, 2025 09:16
@github-actions GitHub Actions
Copy link

github-actions bot commented May 23, 2025 •
edited
Loading

Coverage report for commit: 5b69960
File: coverage/clover.xml

Cover ┌─────────────────────────┐ Freq.
   0% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  10% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  20% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  30% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  40% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  50% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  60% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  70% │ ░░░░░░░░░░░░░░░░░░░░░░░ │  0.0%
  80% │ ███░░░░░░░░░░░░░░░░░░░░ │  5.6%
  90% │ ███████████████████████ │ 55.6%
 100% │ █████████████████░░░░░░ │ 38.9%
      └─────────────────────────┘
 *Legend:* █ = Current Distribution
Summary - Lines: 91.31% | Methods: 97.94% | Branches: 71.58%
FilesLinesMethodsBranches
lib
   contentstack.js100.00%100.00%100.00%
   contentstackClient.js100.00%100.00%85.29%
   contentstackCollection.js86.67%100.00%90.00%
   entity.js81.48%100.00%57.76%
lib/core
   Util.js96.36%100.00%83.64%
   concurrency-queue.js92.40%93.75%84.87%
   contentstackError.js100.00%100.00%100.00%
   contentstackHTTPClient.js100.00%100.00%95.56%
   region.js100.00%100.00%75.00%
lib/marketplace/app/hosting
   deployment.js88.24%100.00%69.74%
   index.js89.23%100.00%65.82%
lib/marketplace/app
   index.js86.21%90.00%58.70%
lib/marketplace/app/oauth
   index.js91.67%100.00%57.89%
lib/marketplace/apprequest
   index.js91.43%100.00%65.85%
lib/marketplace/authorization
   index.js91.67%100.00%72.09%
lib/marketplace
   index.js96.88%100.00%90.48%
lib/marketplace/installation
   index.js90.91%100.00%63.04%
lib/marketplace/installation/webhooks
   index.js89.47%100.00%59.57%

🤖 comment via lucassabreu/comment-coverage-clover

sunil-lakshman
sunil-lakshman approved these changes May 23, 2025
View reviewed changes
Copy link
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

@harshithad0703 harshithad0703 merged commit 7a5ec75 into development May 23, 2025
10 checks passed
@harshithad0703 harshithad0703 deleted the fix/merge-conflicts branch May 23, 2025 09:22
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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@harshithad0703 @sunil-lakshman @cs-raj @aravindbuilt