Merge branch 'adam-backport-ee-1406' into 'master'

Backport changes from gitlab-org/gitlab-ee!1406

See merge request !9897
58 jobs for master in 120 minutes and 53 seconds (queued for 1 minute and 14 seconds)
Status Job ID Name Coverage
  Prepare
passed #12116260
gitlab-org
knapsack

00:03:51

passed #12116266
gitlab-org
setup-test-env

00:13:29

 
  Test
passed #12116402
gitlab-org
bundler:audit

00:00:51

passed #12116401
gitlab-org
bundler:check

00:00:53

passed #12116415
gitlab-org
cache gems

00:01:35

passed #12116386
gitlab-org
license_finder

00:02:59

passed #12116397
gitlab-org
lint-doc

00:02:24

passed #12116414
gitlab-org
lint:javascript

00:00:56

passed #12116405
gitlab-org
migration paths

00:06:54

passed #12116382
gitlab-org
rake brakeman

00:03:20

passed #12116381
gitlab-org
rake config_lint

00:01:03

passed #12116388
gitlab-org
rake db:migrate:reset

00:02:23

passed #12116390
gitlab-org
rake db:seed_fu

00:02:46

passed #12116387
gitlab-org
rake downtime_check

00:01:19

passed #12116384
gitlab-org
rake flay

00:01:26

passed #12116393
gitlab-org
rake gitlab:assets:compile

00:13:36

passed #12116379
gitlab-org
rake haml_lint

00:01:47

passed #12116395
gitlab-org
rake karma

00:14:22

passed #12116380
gitlab-org
rake scss_lint

00:01:46

passed #12116272
gitlab-org
rspec 0 20

00:56:38

passed #12116280
gitlab-org
rspec 1 20

00:56:59

passed #12116322
gitlab-org
rspec 10 20

00:29:24

passed #12116324
gitlab-org
rspec 11 20

00:17:06

passed #12116325
gitlab-org
rspec 12 20

00:30:20

passed #12116328
gitlab-org
rspec 13 20

00:25:35

passed #12116329
gitlab-org
rspec 14 20

00:21:29

passed #12116330
gitlab-org
rspec 15 20

00:18:22

passed #12116332
gitlab-org
rspec 16 20

00:21:45

passed #12116335
gitlab-org
rspec 17 20

00:44:14

passed #12116336
gitlab-org
rspec 18 20

00:53:18

passed #12116339
gitlab-org
rspec 19 20

00:41:58

passed #12116285
gitlab-org
rspec 2 20

00:23:11

passed #12116291
gitlab-org
rspec 3 20

00:41:24

passed #12116298
gitlab-org
rspec 4 20

00:48:08

passed #12127472
gitlab-org
rspec 5 20

00:40:55

passed #12116310
gitlab-org
rspec 6 20

00:17:04

passed #12116316
gitlab-org
rspec 7 20

00:26:15

passed #12116319
gitlab-org
rspec 8 20

00:20:39

passed #12116321
gitlab-org
rspec 9 20

00:43:12

passed #12116377
gitlab-org
rubocop

00:05:42

passed #12116340
gitlab-org
spinach 0 10

00:12:44

passed #12116343
gitlab-org
spinach 1 10

00:34:29

passed #12116345
gitlab-org
spinach 2 10

00:12:00

passed #12116346
gitlab-org
spinach 3 10

00:17:36

passed #12116360
gitlab-org
spinach 4 10

00:08:36

passed #12116369
gitlab-org
spinach 5 10

00:06:45

passed #12116370
gitlab-org
spinach 6 10

00:09:17

passed #12116371
gitlab-org
spinach 7 10

00:12:48

passed #12116374
gitlab-org
spinach 8 10

00:09:46

passed #12116375
gitlab-org
spinach 9 10

00:09:25

failed #12116304
gitlab-org
rspec 5 20

01:30:32

 
  Post Test
passed #12116418
gitlab-org
coverage

00:03:22

93.35%
passed #12116419
gitlab-org
lint:javascript:report

00:04:13

passed #12116434
gitlab-org
notify:slack

00:02:38

passed #12116432
gitlab-org
trigger_docs

00:00:38

passed #12116416
gitlab-org
update-knapsack

00:04:06

 
  Pages
passed #12116435
gitlab-org
pages

00:02:30

 
  Deploy
failed pages:deploy

00:00:00