Add latest changes from gitlab-org/gitlab@master

15 files changed, 61 insertions, 32 deletions

diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md
index a9a13062a25..3777f551996 100644
--- a/doc/administration/job_artifacts.md
+++ b/doc/administration/job_artifacts.md
@@ -353,7 +353,7 @@ you can flip the feature flag from a Rails console.
 
    ```shell
    cd /home/git/gitlab
-   RAILS_ENV=production sudo -u git -H bundle exec rails console
+   sudo -u git -H bundle exec rails console -e production
    ```
 
 1. Flip the switch and disable it:
diff --git a/doc/administration/job_logs.md b/doc/administration/job_logs.md
index 439320279fe..6020d1d2850 100644
--- a/doc/administration/job_logs.md
+++ b/doc/administration/job_logs.md
@@ -106,7 +106,7 @@ gitlab-rails console
 
 # Installation from source
 cd /home/git/gitlab
-sudo -u git -H bin/rails console RAILS_ENV=production
+sudo -u git -H bin/rails console -e production
 ```
 
 **To check if incremental logging (trace) is enabled:**
diff --git a/doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md b/doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md
index b78d5490cd2..69af7ea6801 100644
--- a/doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md
+++ b/doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md
@@ -30,7 +30,7 @@ sudo gitlab-rails console
 For source installations, you'll have to instead run:
 
 ```shell
-sudo -u git -H bundle exec rails console RAILS_ENV=production
+sudo -u git -H bundle exec rails console -e production
 ```
 
 Further code examples will all take place inside the Rails console and also
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index eb9b285803d..91d6717de7e 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -2160,6 +2160,11 @@ type Epic implements Noteable {
   hasIssues: Boolean!
 
   """
+  Indicates if the epic has a parent epic
+  """
+  hasParent: Boolean!
+
+  """
   Current health status of the epic
   """
   healthStatus: EpicHealthStatus
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index f6c3510d6dc..fb642b1222f 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -6337,6 +6337,24 @@
               "deprecationReason": null
             },
             {
+              "name": "hasParent",
+              "description": "Indicates if the epic has a parent epic",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Boolean",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "healthStatus",
               "description": "Current health status of the epic",
               "args": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 082d7decbf9..d1ea825bef3 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -359,6 +359,7 @@ Represents an epic.
 | `group` | Group! | Group to which the epic belongs |
 | `hasChildren` | Boolean! | Indicates if the epic has children |
 | `hasIssues` | Boolean! | Indicates if the epic has direct issues |
+| `hasParent` | Boolean! | Indicates if the epic has a parent epic |
 | `healthStatus` | EpicHealthStatus | Current health status of the epic |
 | `id` | ID! | ID of the epic |
 | `iid` | ID! | Internal ID of the epic |
diff --git a/doc/api/users.md b/doc/api/users.md
index 8d7dad7ae35..90aafcef035 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -75,6 +75,7 @@ GET /users
 | `order_by`   | string | no       | Return users ordered by `id`, `name`, `username`, `created_at`, or `updated_at` fields. Default is `id` |
 | `sort`       | string | no       | Return users sorted in `asc` or `desc` order. Default is `desc` |
 | `two_factor` | string | no       | Filter users by Two-factor authentication. Filter values are `enabled` or `disabled`. By default it returns all users |
+| `without_projects` | boolean | no | Filter users without projects. Default is `false` |
 
 ```json
 [
@@ -207,6 +208,8 @@ You can search users by creation date time range with:
 GET /users?created_before=2001-01-02T00:00:00.060Z&created_after=1999-01-02T00:00:00.060
 ```
 
+You can search for users without projects with: `/users?without_projects=true`
+
 You can filter by [custom attributes](custom_attributes.md) with:
 
 ```plaintext
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index ccff302750c..f70998a5f49 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -39,7 +39,7 @@ Some credentials are required to be able to run `aws` commands:
    ```yml
    deploy:
      stage: deploy
-     image: registry.gitlab.com/gitlab-org/cloud-deploy:latest # see the note below
+     image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest # see the note below
      script:
        - aws s3 ...
        - aws create-deployment ...
@@ -47,7 +47,7 @@ Some credentials are required to be able to run `aws` commands:
 
    NOTE: **Note:**
    Please note that the image used in the example above
-   (`registry.gitlab.com/gitlab-org/cloud-deploy:latest`) is hosted on the [GitLab
+   (`registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest`) is hosted on the [GitLab
    Container Registry](../../user/packages/container_registry/index.md) and is
    ready to use. Alternatively, replace the image with another one hosted on [AWS ECR](#aws-ecr).
 
@@ -119,3 +119,15 @@ After you're all set up on AWS ECS, follow these steps:
    Finally, your AWS ECS service will be updated with the new revision of the
    task definition, making the cluster pull the newest version of your
    application.
+
+Alternatively, if you don't wish to use the `Deploy-ECS.gitlab-ci.yml` template
+to deploy to AWS ECS, you can always use our
+`aws-base` Docker image to run your own [AWS CLI commands for ECS](https://docs.aws.amazon.com/cli/latest/reference/ecs/index.html#cli-aws-ecs).
+
+```yaml
+deploy:
+  stage: deploy
+  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
+  script:
+    - aws ecs register-task-definition ...
+```
diff --git a/doc/development/database_debugging.md b/doc/development/database_debugging.md
index e577ba6ec8f..46cb869fea3 100644
--- a/doc/development/database_debugging.md
+++ b/doc/development/database_debugging.md
@@ -41,8 +41,8 @@ Access the database via one of these commands (they all get you to the same plac
 
 ```ruby
 gdk psql -d gitlabhq_development
-bundle exec rails dbconsole RAILS_ENV=development
-bundle exec rails db RAILS_ENV=development
+bundle exec rails dbconsole -e development
+bundle exec rails db -e development
 ```
 
 - `\q`: Quit/exit
diff --git a/doc/development/import_project.md b/doc/development/import_project.md
index 0701279ddea..78efc6ce2ab 100644
--- a/doc/development/import_project.md
+++ b/doc/development/import_project.md
@@ -78,7 +78,7 @@ The last option is to import a project using a Rails console:
    gitlab-rails console
 
    # For installations from source
-   sudo -u git -H bundle exec rails console RAILS_ENV=production
+   sudo -u git -H bundle exec rails console -e production
    ```
 
 1. Create a project and run `Project::TreeRestorer`:
diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md
index efa58cbeae3..9eb5d5add8a 100644
--- a/doc/development/testing_guide/review_apps.md
+++ b/doc/development/testing_guide/review_apps.md
@@ -136,28 +136,18 @@ browser performance testing using a
 
 ### Node pools
 
-Both `review-apps-ce` and `review-apps-ee` clusters are currently set up with
-two node pools:
+The `review-apps-ee` and `review-apps-ce` clusters are currently set up with
+the following node pools:
 
-- a node pool of non-preemptible `n1-standard-2` (2 vCPU, 7.5 GB memory) nodes
-  dedicated to the `tiller` deployment (see below) with a single node.
-- a node pool of preemptible `n1-standard-2` (2 vCPU, 7.5 GB memory) nodes,
-  with a minimum of 1 node and a maximum of 250 nodes.
+- `review-apps-ee` of preemptible `e2-highcpu-16` (16 vCPU, 16 GB memory) nodes with autoscaling
+- `review-apps-ce` of preemptible `n1-standard-8` (8 vCPU, 16 GB memory) nodes with autoscaling
 
-### Helm/Tiller
+### Helm
 
-The Helm/Tiller version used is defined in the
-[`registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base` image](https://gitlab.com/gitlab-org/gitlab-build-images/blob/master/Dockerfile.gitlab-charts-build-base#L4)
+The Helm version used is defined in the
+[`registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-helm3-kubectl1.14` image](https://gitlab.com/gitlab-org/gitlab-build-images/-/blob/master/Dockerfile.gitlab-helm3-kubectl1.14#L7)
 used by the `review-deploy` and `review-stop` jobs.
 
-The `tiller` deployment (the Helm server) is deployed to a dedicated node pool
-that has the `app=helm` label and a specific
-[taint](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/)
-to prevent other pods from being scheduled on this node pool.
-
-This is to ensure Tiller isn't affected by "noisy" neighbors that could put
-their node under pressure.
-
 ## How to
 
 ### Get access to the GCP Review Apps cluster
@@ -241,7 +231,7 @@ due to Helm or Kubernetes trying to recreate the components.
 
 **Where to look for further debugging:**
 
-Look at a recent `review-deploy` job log, and at the Tiller logs.
+Look at a recent `review-deploy` job log.
 
 **Useful commands:**
 
diff --git a/doc/integration/sourcegraph.md b/doc/integration/sourcegraph.md
index c0ce3c30ca6..5da9dd1fbc9 100644
--- a/doc/integration/sourcegraph.md
+++ b/doc/integration/sourcegraph.md
@@ -42,7 +42,7 @@ gitlab-rails console
 
 # Installation from source
 cd /home/git/gitlab
-sudo -u git -H bin/rails console RAILS_ENV=production
+sudo -u git -H bin/rails console -e production
 ```
 
 Then run the following command to enable the feature flag:
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index b0d90ea0345..e98df17d944 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -947,7 +947,7 @@ backup beforehand.
    For installations from source:
 
    ```shell
-   sudo -u git -H bundle exec rails dbconsole RAILS_ENV=production
+   sudo -u git -H bundle exec rails dbconsole -e production
    ```
 
 1. Check the `ci_group_variables` and `ci_variables` tables:
@@ -982,7 +982,7 @@ backup beforehand.
    For installations from source:
 
    ```shell
-   sudo -u git -H bundle exec rails dbconsole RAILS_ENV=production
+   sudo -u git -H bundle exec rails dbconsole -e production
    ```
 
 1. Clear all the tokens for projects, groups, and the whole instance:
@@ -1015,7 +1015,7 @@ backup beforehand.
    For installations from source:
 
    ```shell
-   sudo -u git -H bundle exec rails dbconsole RAILS_ENV=production
+   sudo -u git -H bundle exec rails dbconsole -e production
    ```
 
 1. Clear all the tokens for pending jobs:
diff --git a/doc/security/unlock_user.md b/doc/security/unlock_user.md
index befb5d12877..bf3bbbb701e 100644
--- a/doc/security/unlock_user.md
+++ b/doc/security/unlock_user.md
@@ -16,7 +16,7 @@ To unlock a locked user:
    sudo gitlab-rails console -e production
 
    ## For installations from source
-   sudo -u git -H bundle exec rails console RAILS_ENV=production
+   sudo -u git -H bundle exec rails console -e production
    ```
 
 1. Find the user to unlock. You can search by email or ID.
diff --git a/doc/user/project/merge_requests/merge_request_approvals.md b/doc/user/project/merge_requests/merge_request_approvals.md
index d378c119aa8..e5896e62397 100644
--- a/doc/user/project/merge_requests/merge_request_approvals.md
+++ b/doc/user/project/merge_requests/merge_request_approvals.md
@@ -277,7 +277,7 @@ gitlab-rails console
 
 # Installation from source
 cd /home/git/gitlab
-sudo -u git -H bin/rails console RAILS_ENV=production
+sudo -u git -H bin/rails console -e production
 ```
 
 Then run `Feature.enable(:approval_rules)` to enable the updated interface.