Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions

* master: (274 commits)
  Update VERSION to 9.2.0-pre
  Update CHANGELOG.md for 9.1.0
  Update Auto Deploy documentation
  Disable import URL field in New project form since it's hidden by default
  Remove reference to burndown charts since they don't exist for ce.
  Use master_password for Sentinel
  Refactor Discussions docs
  Start versioning cached markdown fields
  Refactor add_users method for project and group
  Improved the spec Now correctly tests against different forms
  Refactor environments components into vue files - part 3
  Adding animation for all dropdown
  fix placeholder visibility
  submodule_links: handle urls that don't end with .git
  Add help regarding vue resource and where to include it
  Append .json to ajax endpoint to prevent browser to display raw json
  Fixed the preview keyboard shortcut focusing wrong tab
  Fix broken link
  Added new discussions docs
  Started on resolvable discussions docs
  ...

1 files changed, 2 insertions, 4 deletions

diff --git a/doc/README.md b/doc/README.md
index b6790b4d008..fb393aa09a1 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -6,10 +6,6 @@ All technical content published by GitLab lives in the documentation, including:
   - [User docs](#user-documentation): general documentation dedicated to regular users of GitLab
   - [Admin docs](#administrator-documentation): general documentation dedicated to administrators of GitLab instances
   - [Contributor docs](#contributor-documentation): general documentation on how to develop and contribute to GitLab
-- [Topics](topics/index.md): pages organized per topic, gathering all the
-  resources already published by GitLab related to a specific subject, including
-  general docs, [technical articles](development/writing_documentation.md#technical-articles),
-  blog posts and video tutorials.
 - [GitLab University](university/README.md): guides to learn Git and GitLab
   through courses and videos.
 
@@ -19,6 +15,7 @@ All technical content published by GitLab lives in the documentation, including:
 - [API](api/README.md) Automate GitLab via a simple and powerful API.
 - [CI/CD](ci/README.md) GitLab Continuous Integration (CI) and Continuous Delivery (CD) getting started, `.gitlab-ci.yml` options, and examples.
 - [Container Registry](user/project/container_registry.md) Learn how to use GitLab Container Registry.
+- [Discussions](user/discussions/index.md) Threads, comments, and resolvable discussions in issues, commits, and  merge requests.
 - [Git Attributes](user/project/git_attributes.md) Managing Git attributes using a `.gitattributes` file.
 - [Git cheatsheet](https://gitlab.com/gitlab-com/marketing/raw/master/design/print/git-cheatsheet/print-pdf/git-cheatsheet.pdf) Download a PDF describing the most used Git operations.
 - [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab.
@@ -73,6 +70,7 @@ All technical content published by GitLab lives in the documentation, including:
 - [Sidekiq Troubleshooting](administration/troubleshooting/sidekiq.md) Debug when Sidekiq appears hung and is not processing jobs.
 - [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed.
 - [Update](update/README.md) Update guides to upgrade your installation.
+- [User cohorts](user/admin_area/user_cohorts.md) View user activity over time.
 - [Web terminals](administration/integration/terminal.md) Provide terminal access to environments from within GitLab.
 - [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page.