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

# Conflicts:
#	.gitlab-ci.yml
#	db/schema.rb
#	doc/development/README.md

[ci skip]

.gitlab-ci.yml

@@ -80,6 +80,7 @@ stages:
     - mysql:5.7
     - redis:alpine
 
+<<<<<<< HEAD
 # BEGIN EE-only service helpers
 
 .use-pg-9-6: &use-pg-9-6
@@ -106,6 +107,8 @@ stages:
 
 # END EE-only service helpers
 
+=======
+>>>>>>> upstream/master
 .rails4: &rails4
   allow_failure: false
   except:
@@ -219,6 +222,7 @@ stages:
 .rspec-metadata-mysql-rails4: &rspec-metadata-mysql-rails4
   <<: *rspec-metadata-mysql
   <<: *rails4
+<<<<<<< HEAD
 
 .rspec-metadata-ee: &rspec-metadata-ee
   <<: *rspec-metadata
@@ -277,6 +281,8 @@ stages:
 .rspec-geo-pg-10-2-rails4: &rspec-metadata-pg-geo-10-2-rails4
   <<: *rspec-metadata-pg-geo-10-2
   <<: *rails4
+=======
+>>>>>>> upstream/master
 
 .only-canonical-masters: &only-canonical-masters
   only:

doc/development/README.md

@@ -53,7 +53,10 @@ description: 'Learn how to contribute to GitLab.'
 - [Prometheus metrics](prometheus_metrics.md)
 - [Guidelines for reusing abstractions](reusing_abstractions.md)
 - [DeclarativePolicy framework](policies.md)
+<<<<<<< HEAD
 - [Geo development](geo.md)
+=======
+>>>>>>> upstream/master
 - [Switching to Rails 5](switching_to_rails5.md)
 
 ## Performance guides

doc/development/new_fe_guide/development/testing.md

@@ -231,7 +231,7 @@ Their abstraction level is comparable to how a user would interact with the UI.
 <details>
   <summary>Vuex stores</summary>
   When testing the frontend code of a page as a whole, the interaction between Vue components and Vuex stores is covered as well.
-<details>
+</details>
 
 ## Feature tests