Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-04

# Conflicts:
#	doc/development/contributing/merge_request_workflow.md

[ci skip]

changelogs/unreleased/update_license_management_job.yml

+---
+title: "Remove dind from license_management auto-devops job definition"
+merge_request: 22732
+author:
+type: performance

doc/ci/services/mysql.md

@@ -31,7 +31,7 @@ Database: el_duderino
 ```
 
 If you are wondering why we used `mysql` for the `Host`, read more at
-[How is service linked to the job](../docker/using_docker_images.md#how-is-service-linked-to-the-job).
+[How services are linked to the job](../docker/using_docker_images.md#how-services-are-linked-to-the-job).
 
 You can also use any other docker image available on [Docker Hub][hub-mysql].
 For example, to use MySQL 5.5 the service becomes `mysql:5.5`.

doc/development/contributing/merge_request_workflow.md

@@ -171,7 +171,11 @@ the feature you contribute through all of these steps.
 1. Added to [the website](https://gitlab.com/gitlab-com/www-gitlab-com/), if relevant
 1. Community questions answered
 1. Answers to questions radiated (in docs/wiki/support etc.)
+<<<<<<< HEAD
 1. [Black-box tests/end-to-end tests](../testing_guide/testing_levels.md#black-box-tests-or-end-to-end-tests) added if required. Please contact [the quality team](https://about.gitlab.com/handbook/engineering/quality/#teams) with any questions    
+=======
+1. [Black-box tests/end-to-end tests](../testing_guide/testing_levels.md#black-box-tests-or-end-to-end-tests) added if required. Please contact [the quality team](https://about.gitlab.com/handbook/engineering/quality/#teams) with any questions  
+>>>>>>> upstream/master
 
 If you add a dependency in GitLab (such as an operating system package) please
 consider updating the following and note the applicability of each in your
@@ -186,7 +190,7 @@ merge request:
 1. Omnibus package creator https://gitlab.com/gitlab-org/omnibus-gitlab
 
 [definition-of-done]: http://guide.agilealliance.org/guide/definition-of-done.html
-[testing]: ../testing_guide/index.md
+[testing]: ../testing_guide/index.md  
 
 ---
 

lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml

@@ -116,12 +116,9 @@ code_quality:
 
 license_management:
   stage: test
-  image: docker:stable
+  image: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable"
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - setup_docker
     - license_management
   artifacts:
     paths: [gl-license-management-report.json]
@@ -525,11 +522,7 @@ rollout 100%:
   }
 
   function license_management() {
-    # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable"
-    LICENSE_MANAGEMENT_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-
-    docker run --volume "$PWD:/code" \
-                                    "registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION" analyze /code
+    /run.sh analyze .
   }
 
   function sast() {