Merge branch 'issue_39773_be' into 'master'

Prevent fast forward merge when rebase is required

Closes #39773

See merge request gitlab-org/gitlab-ce!15296
90 jobs for 10-1-stable-patch-2 in 88 minutes and 56 seconds (queued for 18 seconds)
Status Job ID Name Coverage
  Build
manual #39898372
allowed to fail manual
build-package
manual #39898373
allowed to fail manual
review-docs-deploy
 
  Prepare
passed #39898374
gitlab-org
retrieve-tests-metadata

00:02:13

passed #39898375
gitlab-org
setup-test-env

00:11:04

 
  Test
passed #39898459
codeclimate

00:16:02

passed #39898456
gitlab-org
db:check-schema-pg

00:02:56

passed #39898448
gitlab-org
db:migrate:reset-mysql

00:05:54

passed #39898447
gitlab-org
db:migrate:reset-pg

00:04:18

passed #39898452
gitlab-org
db:rollback-mysql

00:05:30

passed #39898451
gitlab-org
db:rollback-pg

00:04:09

passed #39898455
gitlab-org
db:seed_fu-mysql

00:03:42

passed #39898454
gitlab-org
db:seed_fu-pg

00:03:08

passed #39898445
gitlab-org
docs lint

00:01:00

passed #39898446
gitlab-org
downtime_check

00:03:30

passed #39898457
gitlab-org
gitlab:assets:compile

00:07:54

passed #39898460
gitlab_git_test

00:03:07

passed #39898458
gitlab-org
karma

00:12:29

51.71%
passed #39898450
gitlab-org
migration:path-mysql

00:13:59

passed #39898449
gitlab-org
migration:path-pg

00:14:58

passed #39898402
gitlab-org
rspec-mysql 0 25

00:13:34

passed #39899573
gitlab-org
rspec-mysql 1 25

00:16:22

passed #39898417
gitlab-org
rspec-mysql 10 25

00:18:11

passed #39898418
gitlab-org
rspec-mysql 11 25

00:17:18

passed #39898419
gitlab-org
rspec-mysql 12 25

00:20:35

passed #39898420
gitlab-org
rspec-mysql 13 25

00:24:05

passed #39901484
gitlab-org
rspec-mysql 14 25

00:19:16

passed #39898422
gitlab-org
rspec-mysql 15 25

00:16:00

passed #39898423
gitlab-org
rspec-mysql 16 25

00:16:33

passed #39898424
gitlab-org
rspec-mysql 17 25

00:16:01

passed #39898425
gitlab-org
rspec-mysql 18 25

00:20:55

passed #39898426
gitlab-org
rspec-mysql 19 25

00:16:12

passed #39898409
gitlab-org
rspec-mysql 2 25

00:12:50

passed #39898427
gitlab-org
rspec-mysql 20 25

00:18:00

passed #39898428
gitlab-org
rspec-mysql 21 25

00:17:03

passed #39898429
gitlab-org
rspec-mysql 22 25

00:21:06

passed #39898430
gitlab-org
rspec-mysql 23 25

00:17:15

passed #39898431
gitlab-org
rspec-mysql 24 25

00:18:18

passed #39898410
gitlab-org
rspec-mysql 3 25

00:14:30

passed #39898411
gitlab-org
rspec-mysql 4 25

00:13:39

passed #39898412
gitlab-org
rspec-mysql 5 25

00:18:24

passed #39898413
gitlab-org
rspec-mysql 6 25

00:17:13

passed #39898414
gitlab-org
rspec-mysql 7 25

00:16:54

passed #39898415
gitlab-org
rspec-mysql 8 25

00:15:48

passed #39898416
gitlab-org
rspec-mysql 9 25

00:14:28

passed #39898376
gitlab-org
rspec-pg 0 25

00:15:30

passed #39898377
gitlab-org
rspec-pg 1 25

00:16:53

passed #39898387
gitlab-org
rspec-pg 10 25

00:23:01

passed #39898388
gitlab-org
rspec-pg 11 25

00:26:52

passed #39898389
gitlab-org
rspec-pg 12 25

00:16:07

passed #39898390
gitlab-org
rspec-pg 13 25

00:17:03

passed #39898391
gitlab-org
rspec-pg 14 25

00:14:53

passed #39898392
gitlab-org
rspec-pg 15 25

00:16:51

passed #39898393
gitlab-org
rspec-pg 16 25

00:24:17

passed #39898394
gitlab-org
rspec-pg 17 25

00:18:21

passed #39898395
gitlab-org
rspec-pg 18 25

00:14:51

passed #39898396
gitlab-org
rspec-pg 19 25

00:29:41

passed #39898378
gitlab-org
rspec-pg 2 25

00:11:11

passed #39898397
gitlab-org
rspec-pg 20 25

00:17:22

passed #39898398
gitlab-org
rspec-pg 21 25

00:18:46

passed #39898399
gitlab-org
rspec-pg 22 25

00:27:02

passed #39898400
gitlab-org
rspec-pg 23 25

00:29:15

passed #39898401
gitlab-org
rspec-pg 24 25

00:35:35

passed #39898379
gitlab-org
rspec-pg 3 25

00:15:12

passed #39898380
gitlab-org
rspec-pg 4 25

00:14:51

passed #39898381
gitlab-org
rspec-pg 5 25

00:19:43

passed #39898382
gitlab-org
rspec-pg 6 25

00:27:15

passed #39898384
gitlab-org
rspec-pg 7 25

00:23:12

passed #39898385
gitlab-org
rspec-pg 8 25

00:17:10

passed #39910196
gitlab-org
rspec-pg 9 25

00:28:33

passed #39898439
gitlab-org
spinach-mysql 0 5

00:12:32

passed #39898440
gitlab-org
spinach-mysql 1 5

00:09:18

passed #39898441
gitlab-org
spinach-mysql 2 5

00:10:52

passed #39898442
gitlab-org
spinach-mysql 3 5

00:10:28

passed #39898443
gitlab-org
spinach-mysql 4 5

00:10:44

passed #39898432
gitlab-org
spinach-pg 0 5

00:13:57

passed #39898433
gitlab-org
spinach-pg 1 5

00:10:52

passed #39898434
gitlab-org
spinach-pg 2 5

00:10:44

passed #39898437
gitlab-org
spinach-pg 3 5

00:09:40

passed #39898438
gitlab-org
spinach-pg 4 5

00:10:55

passed #39898444
gitlab-org
static-analysis

00:15:51

failed #39898404
gitlab-org
rspec-mysql 1 25

00:02:30

failed #39898421
gitlab-org
rspec-mysql 14 25

00:23:30

failed #39898386
gitlab-org
rspec-pg 9 25

00:40:08

failed #39903898
gitlab-org
rspec-pg 9 25

00:38:03

 
  Post Test
failed #39912529
gitlab-org
coverage

00:05:29

failed #39898461
gitlab-org allowed to fail
flaky-examples-check

00:00:17

failed #39912534
gitlab-org
lint:javascript:report

00:00:12

failed #39898462
gitlab-org
coverage

00:00:35

failed #39898463
gitlab-org
lint:javascript:report

00:00:42

 
  Post Cleanup
skipped #39898464
allowed to fail manual
review-docs-cleanup
 
Name Stage Failure
failed
lint:javascript:report Post Test There is an unknown failure, please try again
Cloning repository for 10-1-stable-patch-2 with git depth set to 20...
Cloning into '/builds/gitlab-org/gitlab-ce'...
warning: Could not find remote branch 10-1-stable-patch-2 to clone.
fatal: Remote branch 10-1-stable-patch-2 not found in upstream origin
Cloning repository for 10-1-stable-patch-2 with git depth set to 20...
Cloning into '/builds/gitlab-org/gitlab-ce'...
warning: Could not find remote branch 10-1-stable-patch-2 to clone.
fatal: Remote branch 10-1-stable-patch-2 not found in upstream origin
ERROR: Job failed: exit code 1
failed
flaky-examples-check Post Test There is an unknown failure, please try again
HEAD is now at e4df83d Merge branch 'revert-2f644452' into 'master'
fatal: Couldn't find remote ref refs/heads/10-1-stable-patch-2
Fetching changes for 10-1-stable-patch-2 with git depth set to 20...
HEAD is now at e4df83d Merge branch 'revert-2f644452' into 'master'
fatal: Couldn't find remote ref refs/heads/10-1-stable-patch-2
Fetching changes for 10-1-stable-patch-2 with git depth set to 20...
HEAD is now at e4df83d Merge branch 'revert-2f644452' into 'master'
fatal: Couldn't find remote ref refs/heads/10-1-stable-patch-2
ERROR: Job failed: exit code 1
failed
coverage Post Test There is an unknown failure, please try again
Cloning repository for 10-1-stable-patch-2 with git depth set to 20...
Cloning into '/builds/gitlab-org/gitlab-ce'...
warning: Could not find remote branch 10-1-stable-patch-2 to clone.
fatal: Remote branch 10-1-stable-patch-2 not found in upstream origin
Cloning repository for 10-1-stable-patch-2 with git depth set to 20...
Cloning into '/builds/gitlab-org/gitlab-ce'...
warning: Could not find remote branch 10-1-stable-patch-2 to clone.
fatal: Remote branch 10-1-stable-patch-2 not found in upstream origin
ERROR: Job failed: exit code 1