Merge branch 'fe-paginated-environments-api' into fe-paginated-environments-paginationfe-paginated-environments-pagination

* fe-paginated-environments-api: (304 commits)
  added missed commit in rebase
  update Grape routes to work with current version of Grape
  adds changelog
  fixes cursor issue on pipeline pagination
  Use random group name to prevent conflicts
  List all groups/projects for admins on explore pages
  Fix indentation
  More backport
  Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory
  Fixed variables_controller_spec.rb test
  Backport of the frontend view, including tests
  Updated the #create action to render the show view in case of a form error
  Improved code styling on the variables_controller_spec
  Added tests for the variables controller #update action
  Added a variable_controller_spec test to test for flash messages on the #create action
  Modified redirection logic in the variables cont.
  Added redirections to the index actions for the variables and triggers controllers
  Added a flash message to the creation of triggers
  Fixed tests, renamed files and methods
  Changed the controller/route name to 'ci/cd' and renamed the corresponding files
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index 5602d70f1ef..3893d837006 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -47,13 +47,13 @@ When using default Omnibus configuration you will need to share 5 data locations
 between all GitLab cluster nodes. No other locations should be shared. The
 following are the 5 locations you need to mount:
 
-| Location | Description |
-| -------- | ----------- |
-| `/var/opt/gitlab/git-data` | Git repository data. This will account for a large portion of your data
-| `/var/opt/gitlab/.ssh` | SSH `authorized_keys` file and keys used to import repositories from some other Git services
-| `/var/opt/gitlab/gitlab-rails/uploads` | User uploaded attachments
-| `/var/opt/gitlab/gitlab-rails/shared` | Build artifacts, GitLab Pages, LFS objects, temp files, etc. If you're using LFS this may also account for a large portion of your data
-| `/var/opt/gitlab/gitlab-ci/builds` | GitLab CI build traces
+| Location | Description | Default configuration |
+| -------- | ----------- | --------------------- |
+| `/var/opt/gitlab/git-data` | Git repository data. This will account for a large portion of your data | `git_data_dirs({"default" => "/var/opt/gitlab/git-data"})`
+| `/var/opt/gitlab/.ssh` | SSH `authorized_keys` file and keys used to import repositories from some other Git services | `user['home'] = '/var/opt/gitlab/'`
+| `/var/opt/gitlab/gitlab-rails/uploads` | User uploaded attachments | `gitlab_rails['uploads_directory'] = '/var/opt/gitlab/gitlab-rails/uploads'`
+| `/var/opt/gitlab/gitlab-rails/shared` | Build artifacts, GitLab Pages, LFS objects, temp files, etc. If you're using LFS this may also account for a large portion of your data | `gitlab_rails['shared_path'] = '/var/opt/gitlab/gitlab-rails/shared'`
+| `/var/opt/gitlab/gitlab-ci/builds` | GitLab CI build traces | `gitlab_ci['builds_directory'] = '/var/opt/gitlab/gitlab-ci/builds'`
 
 Other GitLab directories should not be shared between nodes. They contain
 node-specific files and GitLab code that does not need to be shared. To ship
@@ -73,10 +73,10 @@ as subdirectories. Mount `/gitlab-data` then use the following Omnibus
 configuration to move each data location to a subdirectory:
 
 ```ruby
+git_data_dirs({"default" => "/gitlab-data/git-data"})
 user['home'] = '/gitlab-data/home'
-git_data_dir '/gitlab-data/git-data'
-gitlab_rails['shared_path'] = '/gitlab-data/shared'
 gitlab_rails['uploads_directory'] = '/gitlab-data/uploads'
+gitlab_rails['shared_path'] = '/gitlab-data/shared'
 gitlab_ci['builds_directory'] = '/gitlab-data/builds'
 ```