Automatic merge of gitlab-org/gitlab-ce master

doc/administration/job_artifacts.md

@@ -165,12 +165,6 @@ _The artifacts are stored by default in
     gitlab-rake gitlab:artifacts:migrate
     ```
 
-    Currently this has to be executed manually and it will allow you to
-    migrate the existing artifacts to the object storage, but all new
-    artifacts will still be stored on the local disk. In the future
-    you will be given an option to define a default storage artifacts for all
-    new files.
-
 ---
 
 **In installations from source:**
@@ -201,12 +195,6 @@ _The artifacts are stored by default in
     sudo -u git -H bundle exec rake gitlab:artifacts:migrate RAILS_ENV=production
     ```
 
-    Currently this has to be executed manually and it will allow you to
-    migrate the existing artifacts to the object storage, but all new
-    artifacts will still be stored on the local disk. In the future
-    you will be given an option to define a default storage artifacts for all
-    new files.
-
 ## Expiring artifacts
 
 If an expiry date is used for the artifacts, they are marked for deletion