Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix reactivated users not being added to the user directory #10782

Merged
merged 12 commits into from
Sep 23, 2021
Merged

Fix reactivated users not being added to the user directory #10782

merged 12 commits into from
Sep 23, 2021

Commits on Sep 8, 2021

  1. Cherry-pick "Fix reactivated users not being added to directory " 

    There was a merge conflict relating to the guard on
user_directory_search_all_users. I've chosen to not reinstate the guard
because:

- it's rare that users are going to be reactivated
- I'm going to remove these guards which stop us from inserting into the directory
in upcoming changes (so that guards just protect the search)
- It's less churn

Was originally:
commit c0b8d1b
Author: David Robertson <davidr@element.io>
Date:   Sat Sep 4 03:22:23 2021 +0100
    David Robertson committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    ad6eab0 View commit details
    Browse the repository at this point in the history

  2. Changelog

    David Robertson committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    cf73b68 View commit details
    Browse the repository at this point in the history

  3. Oops, missing import; lint.

    David Robertson committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    963891e View commit details
    Browse the repository at this point in the history

  4. Move the comment down too 

    Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
    @dklimpel
    David Robertson and dklimpel committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    c9b1de0 View commit details
    Browse the repository at this point in the history

  5. Elaborate on the comment.

    David Robertson committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    43a77af View commit details
    Browse the repository at this point in the history

  6. Use password handler rather than direct insertion

    David Robertson committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    d795fc8 View commit details
    Browse the repository at this point in the history

  7. Duplicate changelog

    David Robertson committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    fe11ead View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2021

  1. Merge branch 'develop' into dmr/reactivated-users-in-directory-direct… 

    …-to-develop
    David Robertson committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    8acffee View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Get handler with getter, not private member 

    Co-authored-by: reivilibre <olivier@librepush.net>
    @reivilibre
    David Robertson and reivilibre authored Sep 22, 2021
    Configuration menu
    Copy the full SHA
    e5e1be1 View commit details
    Browse the repository at this point in the history

  2. Reactivate user via admin api, not hacks

    David Robertson committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    9e75c8f View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. Update changelog.d/10782.bugfix 

    Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
    @richvdh
    David Robertson and richvdh authored Sep 23, 2021
    Configuration menu
    Copy the full SHA
    1b637d4 View commit details
    Browse the repository at this point in the history

  2. Remove duplicate changelog from old branch

    David Robertson committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    d5c5558 View commit details
    Browse the repository at this point in the history