Code

Merge users through the console#3327

Code

Merged

jorg-vr merged 22 commits intodevelopdodona-edu/dodona:developfrom feature/2668-merge-users-consoledodona-edu/dodona:feature/2668-merge-users-consoleCopy head branch name to clipboardFeb 1, 2022

+459

Commits

Commits on Jan 24, 2022

• WIP: create first draft of merge_into method

  jorg-vr

  committed
  6affc15

Commits on Jan 25, 2022

• Create merge function for users

  jorg-vr

  committed
  6364aa2

• Add tests

  jorg-vr

  committed
  8c58143

Commits on Jan 26, 2022

• Add repository and course membership merge tests

  jorg-vr

  committed
  beb4f34

• Fix merge identities test

  jorg-vr

  committed
  421e3df

• Cleanup newline

  jorg-vr

  committed
  5b03663

• Merge branch 'develop' into feature/2668-merge-users-console

  jorg-vr

  committed
  1d4371d

• Make mergeing users a transaction

  jorg-vr

  committed
  c35705a

• Create merge script

  jorg-vr

  committed
  7b9fab2

Commits on Jan 27, 2022

• Add swap argument

  jorg-vr

  committed
  56cf7d2

• Fix linting

  jorg-vr

  committed
  0ff9aef

• Remove invalid notice that shows top soon

  jorg-vr

  committed
  d681295

• Move runner to take task and add tests

  jorg-vr

  committed
  9dfa205

• Fix linting

  jorg-vr

  committed
  7288c6b

• Add unique user ids to reduce overlap when testing

  jorg-vr

  committed
  3581223

Commits on Jan 28, 2022

• Fix io stubbing in tests

  jorg-vr

  committed
  d02e982

Commits on Jan 31, 2022

• Merge evaluations and test caching refresh

  jorg-vr

  committed
  6dcc200

• Print evaluations

  jorg-vr

  committed
  b1859ba

• Update order in merge

  jorg-vr

  committed
  bd30909

• Fix incorrect test

  jorg-vr

  committed
  84ae9b8

• Replace delete by destroy

  jorg-vr

  committed
  fb8ab86

• Replace delete and update by destroy! and update!

  jorg-vr

  committed
  2b245b6