Skip to content

Commit 7006c4c

Browse files
authored
Merge pull request #25 from contentstack/staging
DX | 05-01-2026 | Release
2 parents 5b50505 + 1633f61 commit 7006c4c

File tree

5 files changed

+44
-37
lines changed

5 files changed

+44
-37
lines changed

.github/workflows/check-branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Comment PR
11-
if: github.base_ref == 'master' && github.head_ref != 'next'
11+
if: github.base_ref == 'master' && github.head_ref != 'staging'
1212
uses: thollander/actions-comment-pull-request@v2
1313
with:
1414
message: |
1515
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.
1616
- name: Check branch
17-
if: github.base_ref == 'master' && github.head_ref != 'next'
17+
if: github.base_ref == 'master' && github.head_ref != 'staging'
1818
run: |
1919
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."
2020
exit 1

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Changelog
2+
3+
## [1.2.2](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.2.2) (2026-01-05)
4+
- Fixed snyk security issues
25
## [1.2.1](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.2.1) (2024-02-27)
36
- Support for JSON RTE with fragment in nested list
47
## [1.2.0](https://github.com/contentstack/contentstack-utils-ruby/tree/v1.2.0) (2023-06-20)

Gemfile.lock

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,76 @@
11
PATH
22
remote: .
33
specs:
4-
contentstack_utils (1.2.1)
4+
contentstack_utils (1.2.2)
55
activesupport (>= 7.0)
66
nokogiri (>= 1.11)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
activesupport (7.1.3.2)
11+
activesupport (7.2.3)
1212
base64
13+
benchmark (>= 0.3)
1314
bigdecimal
14-
concurrent-ruby (~> 1.0, >= 1.0.2)
15+
concurrent-ruby (~> 1.0, >= 1.3.1)
1516
connection_pool (>= 2.2.5)
1617
drb
1718
i18n (>= 1.6, < 2)
19+
logger (>= 1.4.2)
1820
minitest (>= 5.1)
19-
mutex_m
20-
tzinfo (~> 2.0)
21-
addressable (2.8.6)
22-
public_suffix (>= 2.0.2, < 6.0)
23-
base64 (0.2.0)
24-
bigdecimal (3.1.6)
25-
concurrent-ruby (1.2.3)
26-
connection_pool (2.4.1)
27-
crack (1.0.0)
21+
securerandom (>= 0.3)
22+
tzinfo (~> 2.0, >= 2.0.5)
23+
addressable (2.8.8)
24+
public_suffix (>= 2.0.2, < 8.0)
25+
base64 (0.3.0)
26+
benchmark (0.5.0)
27+
bigdecimal (4.0.1)
28+
concurrent-ruby (1.3.6)
29+
connection_pool (2.5.5)
30+
crack (1.0.1)
2831
bigdecimal
2932
rexml
30-
diff-lcs (1.5.1)
31-
docile (1.4.0)
32-
drb (2.2.1)
33-
hashdiff (1.1.0)
34-
i18n (1.14.1)
33+
diff-lcs (1.6.2)
34+
docile (1.4.1)
35+
drb (2.2.3)
36+
hashdiff (1.2.1)
37+
i18n (1.14.8)
3538
concurrent-ruby (~> 1.0)
36-
minitest (5.22.2)
37-
mutex_m (0.2.0)
38-
nokogiri (1.16.2-arm64-darwin)
39+
logger (1.7.0)
40+
minitest (5.27.0)
41+
nokogiri (1.18.10-arm64-darwin)
3942
racc (~> 1.4)
40-
public_suffix (5.0.4)
41-
racc (1.7.3)
42-
rake (13.1.0)
43-
rexml (3.2.6)
44-
rspec (3.13.0)
43+
public_suffix (6.0.2)
44+
racc (1.8.1)
45+
rake (13.3.1)
46+
rexml (3.4.4)
47+
rspec (3.13.2)
4548
rspec-core (~> 3.13.0)
4649
rspec-expectations (~> 3.13.0)
4750
rspec-mocks (~> 3.13.0)
48-
rspec-core (3.13.0)
51+
rspec-core (3.13.6)
4952
rspec-support (~> 3.13.0)
50-
rspec-expectations (3.13.0)
53+
rspec-expectations (3.13.5)
5154
diff-lcs (>= 1.2.0, < 2.0)
5255
rspec-support (~> 3.13.0)
53-
rspec-mocks (3.13.0)
56+
rspec-mocks (3.13.7)
5457
diff-lcs (>= 1.2.0, < 2.0)
5558
rspec-support (~> 3.13.0)
56-
rspec-support (3.13.1)
59+
rspec-support (3.13.6)
60+
securerandom (0.4.1)
5761
simplecov (0.22.0)
5862
docile (~> 1.1)
5963
simplecov-html (~> 0.11)
6064
simplecov_json_formatter (~> 0.1)
61-
simplecov-html (0.12.3)
65+
simplecov-html (0.13.2)
6266
simplecov_json_formatter (0.1.4)
6367
tzinfo (2.0.6)
6468
concurrent-ruby (~> 1.0)
65-
webmock (3.23.0)
69+
webmock (3.26.1)
6670
addressable (>= 2.8.0)
6771
crack (>= 0.3.2)
6872
hashdiff (>= 0.4.0, < 2.0.0)
69-
yard (0.9.36)
73+
yard (0.9.38)
7074

7175
PLATFORMS
7276
arm64-darwin-22

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2012-2024 Contentstack. All Rights Reserved
3+
Copyright (c) 2012-2026 Contentstack. All Rights Reserved
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

lib/contentstack_utils/version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ContentstackUtils
2-
VERSION = "1.2.1"
3-
end
2+
VERSION = "1.2.2"
3+
end

0 commit comments

Comments
 (0)