Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 2 deletions

diff --git a/spec/controllers/profiles/notifications_controller_spec.rb b/spec/controllers/profiles/notifications_controller_spec.rb
index ba85c781a93..47d6f11fecf 100644
--- a/spec/controllers/profiles/notifications_controller_spec.rb
+++ b/spec/controllers/profiles/notifications_controller_spec.rb
@@ -22,8 +22,9 @@ describe Profiles::NotificationsController do
     end
 
     context 'with groups that do not have notification preferences' do
-      set(:group) { create(:group) }
-      set(:subgroup) { create(:group, parent: group) }
+      let_it_be(:group) { create(:group) }
+      let_it_be(:subgroup) { create(:group, parent: group) }
+
       before do
         group.add_developer(user)
       end