New commit detected on cfme/5.4.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=5898001c9d8df584dd00245ff5872303d19b11f0 commit 5898001c9d8df584dd00245ff5872303d19b11f0 Merge: 4e75aec 89fd380 Author: Gregg Tanzillo <gtanzill> AuthorDate: Tue Jun 21 11:56:37 2016 -0400 Commit: Gregg Tanzillo <gtanzill> CommitDate: Tue Jun 21 11:56:37 2016 -0400 Merge branch 'bz_1343973' into '5.4.z' E-mail Scheduled Report target list too broad https://bugzilla.redhat.com/show_bug.cgi?id=1343973 https://github.com/ManageIQ/manageiq/pull/6260 cherry-pick was clean (just one thing: in spec for logging is used `User.stub(:current_user => @current_user)` instead of `login_as @current_user` ) and other change was that admin user can see all user's emails (this was done in upstream https://github.com/ManageIQ/manageiq/pull/6462) it was just about this change: ``` def self.with_current_user_groups - includes(:miq_groups).where(:miq_groups => {:id => current_user.miq_group_ids}) + current_user.admin_user? ? all : includes(:miq_groups).where(:miq_groups => {:id => current_user.miq_group_ids}) end ``` cc @gtanzill See merge request !973 vmdb/app/controllers/application_controller.rb | 13 ++--- vmdb/app/models/user.rb | 5 +- .../controllers/application_controller_spec.rb | 60 ++++++++++++++++++++++ 3 files changed, 71 insertions(+), 7 deletions(-)