Skip to content
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.

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

M2-6268: Merge backend feature-multiinformant #1301

Conversation

rcmerlo
Copy link
Contributor

@rcmerlo rcmerlo commented May 15, 2024

📝 Description

Merge backend feature-multiinformant, this merge comes after merge 'dev' branch into feature-multiinformant, so we are bringing all production changes in our branch

Had fix some conflicts and did some manual changes because of some classes renames and class hierarchy changes

🔗 Jira Ticket M2-6268

vshvechko and others added 30 commits March 20, 2024 13:38
Bumps [virtualenv](https://github.com/pypa/virtualenv) from 20.25.2 to 20.25.3.
- [Release notes](https://github.com/pypa/virtualenv/releases)
- [Changelog](https://github.com/pypa/virtualenv/blob/main/docs/changelog.rst)
- [Commits](pypa/virtualenv@20.25.2...20.25.3)

---
updated-dependencies:
- dependency-name: virtualenv
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [asyncpg](https://github.com/MagicStack/asyncpg) from 0.27.0 to 0.29.0.
- [Release notes](https://github.com/MagicStack/asyncpg/releases)
- [Commits](MagicStack/asyncpg@v0.27.0...v0.29.0)

---
updated-dependencies:
- dependency-name: asyncpg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* M2-6355: Add command to reencrypt data

* M2-6358: reencrypt data using encrypt_internal function

* M2-6358: Replace comment with orm registry to get all encrypted columns

* M2-6358: Add check do not reencrypt data if answers or answers_items table
Bumps [pyld](https://github.com/digitalbazaar/pyld) from 2.0.3 to 2.0.4.
- [Changelog](https://github.com/digitalbazaar/pyld/blob/master/CHANGELOG.md)
- [Commits](digitalbazaar/pyld@2.0.3...v2.0.4)

---
updated-dependencies:
- dependency-name: pyld
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* M2-5539: Add missing tests for answers API
mbarsukou and others added 26 commits May 6, 2024 14:48
* add notification for tests step
* add create db job
* add coverage pipeline for get badge
* upd readme
#1283)

* M2-6389: Fix invitation for shell without nickname and source data for respondents

* fix: Remove duplicated data for respondent invitations

FirstName and LastName has been removed from respondent invitations this data moved to subject already
…end-workflow

M2 6353 develop backend workflow
…nt-development-merge-240513

Feature/multiinformant development merge 240513
@rcmerlo rcmerlo requested a review from mbanting May 16, 2024 14:07
Copy link
Contributor

@mbanting mbanting left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed and smoke tested (ie. not thorough detailed testing) on my local environment against a local admin panel and web app.

Is it safe to assume the OASDIFF breaking changes flagged below are already known and as a result of changes on the source branch?

@rcmerlo rcmerlo merged commit cb98038 into feature/multiinformant-metapod May 20, 2024
18 of 20 checks passed
@rcmerlo rcmerlo deleted the M2-6268-BE-Merge-backend-multi-informant-source-branch-Sprint-9-wk-1 branch May 23, 2024 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants