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.

Sign up for GitHub

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

Jump to bottom

Merge accounts #1683

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open

Merge accounts #1683

wants to merge 29 commits into from

Commits on Nov 21, 2023

  1. merge simple attributes

    @fherreazcue
    fherreazcue committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    7533775 View commit details
    Browse the repository at this point in the history

  2. destroy other person after merge

    @fherreazcue
    fherreazcue committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    92fc04a View commit details
    Browse the repository at this point in the history

  3. merge group_memberships (work_groups and projects)

    @fherreazcue
    fherreazcue committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    beb336d View commit details
    Browse the repository at this point in the history

  4. Guard 'destroy' and back-up other person's details in tests before de… 

    …letion
    @fherreazcue
    fherreazcue committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    8a5f37c View commit details
    Browse the repository at this point in the history

  5. merge annotations

    @fherreazcue
    fherreazcue committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    c58e87b View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Programmes and institutions also covered by group_memberships

    @fherreazcue
    fherreazcue committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    7a90b11 View commit details
    Browse the repository at this point in the history

  2. check not merging empty arrays

    @fherreazcue
    fherreazcue committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    525d8f1 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. merge subscriptions

    @fherreazcue
    fherreazcue committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    c43cdae View commit details
    Browse the repository at this point in the history

  2. Merge resources (contributor and creator)

    @fherreazcue
    fherreazcue committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    a34e8c0 View commit details
    Browse the repository at this point in the history

  3. Merge permissions

    @fherreazcue
    fherreazcue committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    1daacd7 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge roles

    @fherreazcue
    fherreazcue committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    f0b8dbf View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Refactor merge_associations

    @fherreazcue
    fherreazcue committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    4802091 View commit details
    Browse the repository at this point in the history

  2. Merge user

    @fherreazcue
    fherreazcue committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    5e1f0c9 View commit details
    Browse the repository at this point in the history

  3. Adds activity log

    @fherreazcue
    fherreazcue committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    7a34d00 View commit details
    Browse the repository at this point in the history

  4. rubocop

    @fherreazcue
    fherreazcue committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    9f7ce4c View commit details
    Browse the repository at this point in the history

  5. Person.transaction wraps all

    @fherreazcue
    fherreazcue committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    ec4c515 View commit details
    Browse the repository at this point in the history

  6. Use send instead of constantize

    @fherreazcue
    fherreazcue committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    003c0ce View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Use in_batches for update_all or destroy_all.

    @fherreazcue
    fherreazcue committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    ebb6463 View commit details
    Browse the repository at this point in the history

  2. merge_user also interrupted if no other_person.user

    @fherreazcue
    fherreazcue committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    40fcf76 View commit details
    Browse the repository at this point in the history

  3. Moved simple_attributes and annotation_types lists into merge methods.

    @fherreazcue
    fherreazcue committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    8d64fe9 View commit details
    Browse the repository at this point in the history

  4. Improved merge all types of resources test

    @fherreazcue
    fherreazcue committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    8938b7a View commit details
    Browse the repository at this point in the history

  5. Merge annotations_by

    @fherreazcue
    fherreazcue committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    35536fa View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. simplify merge annotations test

    @fherreazcue
    fherreazcue committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    f19cc32 View commit details
    Browse the repository at this point in the history

  2. Improved merge permissions test

    @fherreazcue
    fherreazcue committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    122eb02 View commit details
    Browse the repository at this point in the history

  3. Use destroy!

    @fherreazcue
    fherreazcue committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    84926ca View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Merge branch 'main' into merge-accounts

    @stuzart
    stuzart committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    a436c70 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Merge branch 'main' into merge-accounts

    @stuzart
    stuzart committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    6e2b09b View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Merge branch 'main' into merge-accounts

    @stuzart
    stuzart committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    e7b8efc View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge branch 'main' into merge-accounts

    @stuzart
    stuzart committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    4cbc593 View commit details
    Browse the repository at this point in the history