From c2e8a5d0a3006393234ee68707096c42d2df6d3a Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Tue, 30 Dec 2025 15:31:39 +0530 Subject: [PATCH 1/4] Updated gemlock file --- Gemfile.lock | 66 ++++++++++++++++++++++++++++------------------------ LICENSE | 2 +- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9ceee0d..c386cb1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,65 +8,69 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.2.3) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - base64 (0.2.0) - bigdecimal (3.1.6) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) - crack (1.0.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) + base64 (0.3.0) + benchmark (0.5.0) + bigdecimal (4.0.1) + concurrent-ruby (1.3.6) + connection_pool (2.5.5) + crack (1.0.1) bigdecimal rexml - diff-lcs (1.5.1) - docile (1.4.0) - drb (2.2.1) - hashdiff (1.1.0) - i18n (1.14.1) + diff-lcs (1.6.2) + docile (1.4.1) + drb (2.2.3) + hashdiff (1.2.1) + i18n (1.14.8) concurrent-ruby (~> 1.0) - minitest (5.22.2) - mutex_m (0.2.0) - nokogiri (1.16.2-arm64-darwin) + logger (1.7.0) + minitest (5.27.0) + nokogiri (1.18.10-arm64-darwin) racc (~> 1.4) - public_suffix (5.0.4) - racc (1.7.3) - rake (13.1.0) - rexml (3.2.6) - rspec (3.13.0) + public_suffix (6.0.2) + racc (1.8.1) + rake (13.3.1) + rexml (3.4.4) + rspec (3.13.2) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.6) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.7) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.1) + rspec-support (3.13.6) + securerandom (0.4.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.2) simplecov_json_formatter (0.1.4) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - webmock (3.23.0) + webmock (3.26.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - yard (0.9.36) + yard (0.9.38) PLATFORMS arm64-darwin-22 diff --git a/LICENSE b/LICENSE index 8f0cc82..1b50e3b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2012-2024 Contentstack. All Rights Reserved +Copyright (c) 2012-2025 Contentstack. All Rights Reserved Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 01ab31c1314b62d3ce85ed1715701b9190c9d3e9 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 2 Jan 2026 11:52:38 +0530 Subject: [PATCH 2/4] Updated License year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 1b50e3b..8d26a84 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2012-2025 Contentstack. All Rights Reserved +Copyright (c) 2012-2026 Contentstack. All Rights Reserved Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 90ff445e000511f258c95fe0c7c512c105a2b11c Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 2 Jan 2026 12:07:08 +0530 Subject: [PATCH 3/4] version bump --- CHANGELOG.md | 3 +++ Gemfile.lock | 2 +- lib/contentstack_utils/version.rb | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82fb247..b6644fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # Changelog + +## [1.2.2](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.2.2) (2026-01-05) + - Fixed snyk security issues ## [1.2.1](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.2.1) (2024-02-27) - Support for JSON RTE with fragment in nested list ## [1.2.0](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.2.0) (2023-06-20) diff --git a/Gemfile.lock b/Gemfile.lock index c386cb1..aba6701 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - contentstack_utils (1.2.1) + contentstack_utils (1.2.2) activesupport (>= 7.0) nokogiri (>= 1.11) diff --git a/lib/contentstack_utils/version.rb b/lib/contentstack_utils/version.rb index 83c44e0..6824645 100644 --- a/lib/contentstack_utils/version.rb +++ b/lib/contentstack_utils/version.rb @@ -1,3 +1,3 @@ module ContentstackUtils - VERSION = "1.2.1" -end \ No newline at end of file + VERSION = "1.2.2" +end From 61f9104705633e99d97ce76e30c2923982685f24 Mon Sep 17 00:00:00 2001 From: sunil-lakshman <104969541+sunil-lakshman@users.noreply.github.com> Date: Fri, 2 Jan 2026 13:43:09 +0530 Subject: [PATCH 4/4] Updated workflow file --- .github/workflows/check-branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-branch.yml b/.github/workflows/check-branch.yml index 1e2d24a..e79864e 100644 --- a/.github/workflows/check-branch.yml +++ b/.github/workflows/check-branch.yml @@ -8,13 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Comment PR - if: github.base_ref == 'master' && github.head_ref != 'next' + if: github.base_ref == 'master' && github.head_ref != 'staging' uses: thollander/actions-comment-pull-request@v2 with: message: | We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch. - name: Check branch - if: github.base_ref == 'master' && github.head_ref != 'next' + if: github.base_ref == 'master' && github.head_ref != 'staging' run: | echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch." exit 1 \ No newline at end of file