…to feat/directory

* 'feat/directory' of github.com:RocketChat/Rocket.Chat:
  Update app/lib/server/functions/saveUser.js
  Update app/channel-settings/server/methods/saveRoomSettings.js
  Regression: Block users was not possible for 1:1 DMs (#17105)
  Regression: Collapsible elements didn't respect attachment parameter. (#16994)
  [FIX] Apps Engine notifyRoom sending notification to wrong users (#17093)
  Update .eslintrc
  Bump version to 3.0.8
  Regression: Remove model observe that was used to control the status of the Omnichannel agents (#17078)
  [FIX] Emit livechat events to instace only (#17086)
  Reduce notifyUser propagation (#17088)
  [FIX] Error when websocket received status update event (#17089)
  [FIX] Error when websocket received status update event (#17089)
  Reduce notifyUser propagation (#17088)
  Regression: Remove model observe that was used to control the status of the Omnichannel agents (#17078)

…default-favorite-channels

* 'develop' of github.com:RocketChat/Rocket.Chat: (304 commits)
  [FIX] Omnichannel endpoint `inquiries.getOne` returning only queued inquiries (#17132)
  Fix design review (#17133)
  Regression: Direct message creation by REST (#17109)
  Regression: Can't login with 2FA over REST API when 2FA via Email is enabled (#17128)
  Regression: Fix engagement dashboard urls, fixing Flowrouter imports (#17127)
  Regression: IE11 Support (#17125)
  [FIX] Federation delete room event not being dispatched (#16861)
  [FIX] Federation Event ROOM_ADD_USER not being dispatched (#16878)
  New Troubleshoot section for disabling features (#17114)
  Regression: Wrong size of Directory search/sort icons and Sort Channels menu not showing on production build (#17118)
  [NEW] Discussions: Inherit the public status of parent channel (#17070)
  Regression: fix fuselage import, remove directory css (#17116)
  [IMPROVE] Apps Engine: Reduce some stream calls and remove a find user from the app's status changes (#17115)
  Regression: Remove old and closed Omnichannel inquiries (#17113)
  [FIX] Member's list only filtering users already on screen (#17110)
  Single codebase announcement (#17081)
  [NEW] Directory page refactored, new user's bio field (#17043)
  [NEW] Sort List, View Mode and Group by revamp (#17103)
  Regression: Files were been deleted when deleting users as last members of private rooms (#17111)
  Regression: Block users was not possible for 1:1 DMs (#17105)
  ...

…per-call-meteor-methods-over-rest

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Regression: Can't login with 2FA over REST API when 2FA via Email is enabled (#17128)
  Regression: Fix engagement dashboard urls, fixing Flowrouter imports (#17127)
  Regression: IE11 Support (#17125)
  [FIX] Federation delete room event not being dispatched (#16861)
  [FIX] Federation Event ROOM_ADD_USER not being dispatched (#16878)
  New Troubleshoot section for disabling features (#17114)
  Regression: Wrong size of Directory search/sort icons and Sort Channels menu not showing on production build (#17118)
  [NEW] Discussions: Inherit the public status of parent channel (#17070)
  Regression: fix fuselage import, remove directory css (#17116)
  [IMPROVE] Apps Engine: Reduce some stream calls and remove a find user from the app's status changes (#17115)
  Regression: Remove old and closed Omnichannel inquiries (#17113)
  [FIX] Member's list only filtering users already on screen (#17110)
  Single codebase announcement (#17081)
  [NEW] Directory page refactored, new user's bio field (#17043)
  [NEW] Sort List, View Mode and Group by revamp (#17103)
  Regression: Files were been deleted when deleting users as last members of private rooms (#17111)
  Regression: Block users was not possible for 1:1 DMs (#17105)
  Regression: Collapsible elements didn't respect attachment parameter. (#16994)
  [FIX] Apps Engine notifyRoom sending notification to wrong users (#17093)