Automatic merge of gitlab-org/gitlab-ce master

doc/administration/uploads.md

@@ -120,30 +120,7 @@ _The uploads are stored by default in
     ```
 
 1. Save the file and [reconfigure GitLab][] for the changes to take effect.
-1. Migrate any existing local uploads to the object storage:
-
-    > **Notes:**
-    > These task complies with the `BATCH` environment variable to process uploads in batch (200 by default). All of the processing will be done in a background worker and requires **no downtime**.
-
-    ```bash
-    # gitlab-rake gitlab:uploads:migrate[uploader_class, model_class, mount_point]
- 	
-    # Avatars
-    gitlab-rake "gitlab:uploads:migrate[AvatarUploader, Project, :avatar]"
-    gitlab-rake "gitlab:uploads:migrate[AvatarUploader, Group, :avatar]"
-    gitlab-rake "gitlab:uploads:migrate[AvatarUploader, User, :avatar]"
- 
-    # Attachments
-    gitlab-rake "gitlab:uploads:migrate[AttachmentUploader, Note, :attachment]"
-    gitlab-rake "gitlab:uploads:migrate[AttachmentUploader, Appearance, :logo]"
-    gitlab-rake "gitlab:uploads:migrate[AttachmentUploader, Appearance, :header_logo]"
- 
-    # Markdown
-    gitlab-rake "gitlab:uploads:migrate[FileUploader, Project]"
-    gitlab-rake "gitlab:uploads:migrate[PersonalFileUploader, Snippet]"
-    gitlab-rake "gitlab:uploads:migrate[NamespaceFileUploader, Snippet]"
-    gitlab-rake "gitlab:uploads:migrate[FileUploader, MergeRequest]"
-    ```
+1. Migrate any existing local uploads to the object storage using [`gitlab:uploads:migrate` rake task](raketasks/uploads/migrate.md).
 
 ---
 
@@ -168,32 +145,7 @@ _The uploads are stored by default in
     ```
 
 1. Save the file and [restart GitLab][] for the changes to take effect.
-1. Migrate any existing local uploads to the object storage:
-
-    > **Notes:**
-    > - These task comply with the `BATCH` environment variable to process uploads in batch (200 by default). All of the processing will be done in a background worker and requires **no downtime**.
-    > - To migrate in production use `RAILS_ENV=production` environment variable.
-
-    ```bash
-    # sudo -u git -H bundle exec rake gitlab:uploads:migrate
-   
-    # Avatars
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[AvatarUploader, Project, :avatar]"
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[AvatarUploader, Group, :avatar]"
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[AvatarUploader, User, :avatar]"
- 
-    # Attachments
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[AttachmentUploader, Note, :attachment]"
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[AttachmentUploader, Appearance, :logo]"
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[AttachmentUploader, Appearance, :header_logo]"
- 
-    # Markdown
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[FileUploader, Project]"
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[PersonalFileUploader, Snippet]"
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[NamespaceFileUploader, Snippet]"
-    sudo -u git -H bundle exec rake "gitlab:uploads:migrate[FileUploader, MergeRequest]"
-   
-    ```
+1. Migrate any existing local uploads to the object storage using [`gitlab:uploads:migrate` rake task](raketasks/uploads/migrate.md).
 
 [reconfigure gitlab]: restart_gitlab.md#omnibus-gitlab-reconfigure "How to reconfigure Omnibus GitLab"
 [restart gitlab]: restart_gitlab.md#installations-from-source "How to restart GitLab"

doc/ci/yaml/README.md

@@ -203,7 +203,7 @@ used for time of the job. The configuration of this feature is covered in
 jobs, including deploy jobs, but after the restoration of [artifacts](#artifacts).
 This can be an array or a multi-line string.
 
-`after_script` is used to define the command that will be run after for all
+`after_script` is used to define the command that will be run after all
 jobs, including failed ones. This has to be an array or a multi-line string.
 
 The `before_script` and the main `script` are concatenated and run in a single context/container.