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

LF-4240: April 2024 data policy updates (Version 6: May 31, 2024) #3217

Merged
merged 40 commits into from
Jun 5, 2024

Conversation

SayakaOno
Copy link
Collaborator

@SayakaOno SayakaOno commented May 29, 2024

Description

Data policy updates (Version 6: May 31, 2024).
Branched out from the main branch.

Jira link: https://lite-farm.atlassian.net/browse/LF-4240

@SayakaOno SayakaOno added the enhancement New feature or request label May 29, 2024
@SayakaOno SayakaOno self-assigned this May 29, 2024
Copy link
Collaborator

@kathyavini kathyavini left a comment

Choose a reason for hiding this comment

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

The typos that David found:

SayakaOno and others added 17 commits June 3, 2024 12:26
- add missing space

Co-authored-by: Joyce Yuki <[email protected]>
* remove unnecessary section
* correct who funds LiteFarm link
* correct who funds LiteFarm link
* correct Información sobre la Administración de la Finca section
* fix ¿Cómo utilizamos los datos? section
* add missing part to ¿Dónde almacenamos sus datos?
* fix format in Como usamos os dados?
* add version date
* fix typo
* add version date
* fix typo
* add version date
* fix typo
@SayakaOno SayakaOno changed the title [WIP] LF-4240: April 2024 data policy updates LF-4240: April 2024 data policy updates (Version 6: May 31, 2024) Jun 4, 2024
@SayakaOno SayakaOno marked this pull request as ready for review June 4, 2024 21:04
@SayakaOno SayakaOno requested review from a team as code owners June 4, 2024 21:04
@SayakaOno SayakaOno requested review from Duncan-Brain and kathyavini and removed request for a team June 4, 2024 21:04
kathyavini
kathyavini previously approved these changes Jun 4, 2024
kathyavini
kathyavini previously approved these changes Jun 5, 2024
* @returns { Promise<void> }
*/
export const up = async function (knex) {
await knex('userFarm').update('has_consent', false);
Copy link
Collaborator

@Duncan-Brain Duncan-Brain Jun 5, 2024

Choose a reason for hiding this comment

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

@kathyavini made a good point about migrations files ordering. Just wanted to clarify if the intended order is to merge directly into main, then back into integration afterwards? Or does it matter?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I don't think the order will make any difference. We will:

  1. merge this PR to integration
  2. create a release branch that includes the code changes in this PR + version update and merge into main
  3. merge main to integration

@kathyavini kathyavini added this pull request to the merge queue Jun 5, 2024
Merged via the queue into integration with commit 5ec1be4 Jun 5, 2024
5 checks passed
SayakaOno added a commit that referenced this pull request Jun 5, 2024
…data_policy_updates"

This reverts commit 5ec1be4, reversing
changes made to b77f43d.
github-merge-queue bot pushed a commit that referenced this pull request Jun 5, 2024
…UPDATES

Revert "Merge pull request #3217 from LiteFarmOrg/LF-4240/April_2024_data_policy_updates"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants