add has_may requested_merge_from

2021-11-04 15:51:54 +01:00 · 2021-11-04 15:51:54 +01:00 · 17d131b3cc
commit 17d131b3cc
parent d1162d7493
2 changed files with 3 additions and 1 deletions
--- a/app/controllers/users/profil_controller.rb
+++ b/app/controllers/users/profil_controller.rb
@ -61,7 +61,7 @@ module Users
    end

    def users_requesting_merge
-      @requesting_merge ||= User.where(requested_merge_into: current_user)
+      @requesting_merge ||= current_user.requested_merge_from
    end

    def ensure_update_email_is_authorized