Fix/merge conflits #34
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Feat/cs 44495 added reference support (#24) * Next (#22) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Added reference support and fixed package build issues * Next (#22) (#27) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url --------- Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com> Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com>
|
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. |
cs-raj
approved these changes
Sep 26, 2024
sunil-lakshman
added a commit
that referenced
this pull request
May 5, 2025
* Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Feat/cs 44495 added reference support (#24) * Next (#22) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Added reference support and fixed package build issues * Next (#22) (#27) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Back merge (#31) * Next (#25) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Feat/cs 44495 added reference support (#24) * Next (#22) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Added reference support and fixed package build issues * Next (#22) (#27) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url --------- Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com> Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com> * sca-scan.yml * jira.yml * sast-scan.yml * codeql-analysis.yml --------- Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com> Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com> Co-authored-by: Aravind Kumar <aravind.kumar@contentstack.com> * node type link issue due to attribute changed from href to url (#30) * Resolved merge conflits (#33) * Fix/merge conflits (#34) * Next (#25) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Feat/cs 44495 added reference support (#24) * Next (#22) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Added reference support and fixed package build issues * Next (#22) (#27) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url --------- Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com> Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com> * sca-scan.yml * jira.yml * sast-scan.yml * codeql-analysis.yml --------- Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com> Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com> Co-authored-by: Aravind Kumar <aravind.kumar@contentstack.com> * sca-scan.yml * jira.yml * sast-scan.yml * codeql-analysis.yml * Updated codeowners * policy-scan.yml * issues-jira.yml * Delete jira.yml * Delete sast-scan.yml * codeql-analysis.yml * Updated codeowners * policy-scan.yml --------- Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com> Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com> Co-authored-by: Aravind Kumar <aravind.kumar@contentstack.com> Co-authored-by: cs-raj <122264749+cs-raj@users.noreply.github.com>
Merged
sunil-lakshman
added a commit
that referenced
this pull request
May 5, 2025
* Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Feat/cs 44495 added reference support (#24) * Next (#22) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Added reference support and fixed package build issues * Next (#22) (#27) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Back merge (#31) * Next (#25) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Feat/cs 44495 added reference support (#24) * Next (#22) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Added reference support and fixed package build issues * Next (#22) (#27) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url --------- * sca-scan.yml * jira.yml * sast-scan.yml * codeql-analysis.yml --------- * node type link issue due to attribute changed from href to url (#30) * Resolved merge conflits (#33) * Fix/merge conflits (#34) * Next (#25) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Feat/cs 44495 added reference support (#24) * Next (#22) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url * Added reference support and fixed package build issues * Next (#22) (#27) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Feat/cs 44004 json rte nested list fragment (#21) * Fixed snyk issues and added auto publish package support in github ac… (#19) * Fixed snyk issues and added auto publish package support in github action. (#18) * Fixed snyk issues and added auto publish package support in github ac… (#20) * Fixed snyk issues and added auto publish package support in github action. * Added security file and updated license * Updated changelog file message * Updated python version in github action file * Updated pip and pylint * Added fragment style attribute in JSON RTE nested list Updated License file. * Fix/cs 44004 changed host name (#23) * Added fragment style attribute in JSON RTE nested list Updated License file. * Changed dev url to prod url --------- * sca-scan.yml * jira.yml * sast-scan.yml * codeql-analysis.yml --------- * sca-scan.yml * jira.yml * sast-scan.yml * codeql-analysis.yml * Updated codeowners * policy-scan.yml * issues-jira.yml * Delete jira.yml * Delete sast-scan.yml * codeql-analysis.yml * Updated codeowners * policy-scan.yml --------- Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com> Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com> Co-authored-by: Aravind Kumar <aravind.kumar@contentstack.com> Co-authored-by: cs-raj <122264749+cs-raj@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.