Skip to content

Commit 22af676

Browse files
authored
Merge branch 'development' into fix/DX-3746-improve-error-msgs
2 parents 5094f52 + 7280bf7 commit 22af676

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
## CHANGELOG
22

3+
## Version 0.8.0
4+
### Date: 05th-January-2026
5+
### Security Bug
6+
- Fixed snyk security issues and updated license year
7+
8+
------------------------------------------------
9+
310
## Version 0.8.0
411
### Date: 14th-May-2024
512
### Enhancement

Gemfile.lock

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
PATH
22
remote: .
33
specs:
4-
contentstack (0.8.0)
4+
contentstack (0.8.1)
55
activesupport (>= 3.2)
66
contentstack_utils (~> 1.0)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
activesupport (8.1.1)
11+
activesupport (7.2.3)
1212
base64
13+
benchmark (>= 0.3)
1314
bigdecimal
1415
concurrent-ruby (~> 1.0, >= 1.3.1)
1516
connection_pool (>= 2.2.5)
1617
drb
1718
i18n (>= 1.6, < 2)
18-
json
1919
logger (>= 1.4.2)
2020
minitest (>= 5.1)
2121
securerandom (>= 0.3)
2222
tzinfo (~> 2.0, >= 2.0.5)
23-
uri (>= 0.13.1)
2423
addressable (2.8.8)
2524
public_suffix (>= 2.0.2, < 8.0)
2625
base64 (0.3.0)
27-
bigdecimal (3.3.1)
26+
benchmark (0.5.0)
27+
bigdecimal (4.0.1)
2828
concurrent-ruby (1.3.6)
29-
connection_pool (3.0.2)
29+
connection_pool (2.5.5)
3030
contentstack_utils (1.2.1)
3131
activesupport (>= 7.0)
3232
nokogiri (>= 1.11)
@@ -37,14 +37,13 @@ GEM
3737
docile (1.4.1)
3838
drb (2.2.3)
3939
hashdiff (1.2.1)
40-
i18n (1.14.7)
40+
i18n (1.14.8)
4141
concurrent-ruby (~> 1.0)
42-
json (2.18.0)
4342
logger (1.7.0)
4443
minitest (5.27.0)
4544
nokogiri (1.18.10-arm64-darwin)
4645
racc (~> 1.4)
47-
public_suffix (7.0.0)
46+
public_suffix (6.0.2)
4847
racc (1.8.1)
4948
rexml (3.4.4)
5049
rspec (3.10.0)

LICENSE.txt

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ You can use advanced sync queries to fetch custom results while performing initi
187187

188188
## **The MIT License (MIT)**
189189

190-
Copyright © 2012-2021 [Contentstack](https://www.contentstack.com). All Rights Reserved
190+
Copyright © 2012-2026 [Contentstack](https://www.contentstack.com). All Rights Reserved
191191

192192
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
193193

lib/contentstack/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Contentstack
2-
VERSION = "0.8.0"
2+
VERSION = "0.8.1"
33
end

0 commit comments

Comments
 (0)