Automatic merge of gitlab-org/gitlab-ce master

doc/ci/introduction/index.md

@@ -156,7 +156,7 @@ Once you're happy with your implementation:
 
 ![GitLab workflow example](img/gitlab_workflow_example_11_9.png)
 
-GitLab CI/CD is capable of a doing a lot more, but this workflow
+GitLab CI/CD is capable of doing a lot more, but this workflow
 exemplifies GitLab's ability to track the entire process,
 without the need of any external tool to deliver your software.
 And, most usefully, you can visualize all the steps through

doc/integration/elasticsearch.md

@@ -85,7 +85,7 @@ To build and install the indexer, run:
 
 ```sh
 git clone https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer.git
-cd /gitlab-elasticsearch-indexer
+cd gitlab-elasticsearch-indexer
 make
 sudo make install
 ```

lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml

@@ -338,7 +338,6 @@ rollout 100%:
       image_tag=${CI_APPLICATION_TAG:-$CI_COMMIT_TAG}
     fi
 
-    replicas="1"
     service_enabled="true"
     postgres_enabled="$POSTGRES_ENABLED"