Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into 'master'

Add support for PreReceiveError in UserMergeBranch RPC

Closes gitaly#979

See merge request !16765
89 jobs for 42242-clean-up-error-handling-in-project-permissions-page in 30 minutes and 16 seconds (queued for 8 seconds)
latest
Status Job ID Name Coverage
  Build
manual #50287316
gitlab-org allowed to fail manual
package-qa
manual #50287317
gitlab-org allowed to fail manual
review-docs-deploy
 
  Prepare
passed #50287319
gitlab-org
compile-assets

00:08:14

passed #50287318
gitlab-org
retrieve-tests-metadata

00:01:20

passed #50287320
gitlab-org
setup-test-env

00:06:04

 
  Test
passed #50287398
codequality

00:20:38

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

00:01:49

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

00:04:28

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

00:04:00

passed #50287393
gitlab-org
db:rollback-mysql

00:04:41

passed #50287392
gitlab-org
db:rollback-pg

00:04:03

passed #50287384
gitlab-org
docs lint

00:01:17

passed #50287385
gitlab-org
downtime_check

00:03:25

passed #50287386
gitlab-org
ee_compat_check

00:04:25

passed #50287396
gitlab-org
gitlab:assets:compile

00:09:11

passed #50287395
gitlab-org
gitlab:setup-mysql

00:07:55

passed #50287394
gitlab-org
gitlab:setup-pg

00:08:32

passed #50287402
gitlab-org
gitlab_git_test

00:03:10

passed #50287397
gitlab-org
karma

00:08:04

53.34%
passed #50287391
gitlab-org
migration:path-mysql

00:13:09

passed #50287390
gitlab-org
migration:path-pg

00:10:38

passed #50287400
gitlab-org
qa:internal

00:07:51

passed #50287401
gitlab-org
qa:selectors

00:09:30

passed #50287348
gitlab-org
rspec-mysql 0 27

00:13:57

passed #50287349
gitlab-org
rspec-mysql 1 27

00:13:40

passed #50287359
gitlab-org
rspec-mysql 10 27

00:13:15

passed #50287360
gitlab-org
rspec-mysql 11 27

00:14:18

passed #50287361
gitlab-org
rspec-mysql 12 27

00:13:57

passed #50287362
gitlab-org
rspec-mysql 13 27

00:13:40

passed #50287363
gitlab-org
rspec-mysql 14 27

00:14:50

passed #50287364
gitlab-org
rspec-mysql 15 27

00:11:52

passed #50287365
gitlab-org
rspec-mysql 16 27

00:14:39

passed #50287366
gitlab-org
rspec-mysql 17 27

00:13:50

passed #50287367
gitlab-org
rspec-mysql 18 27

00:16:08

passed #50287368
gitlab-org
rspec-mysql 19 27

00:14:18

passed #50287351
gitlab-org
rspec-mysql 2 27

00:12:49

passed #50287369
gitlab-org
rspec-mysql 20 27

00:15:25

passed #50287370
gitlab-org
rspec-mysql 21 27

00:10:42

passed #50287371
gitlab-org
rspec-mysql 22 27

00:09:50

passed #50287372
gitlab-org
rspec-mysql 23 27

00:12:12

passed #50287373
gitlab-org
rspec-mysql 24 27

00:13:32

passed #50287374
gitlab-org
rspec-mysql 25 27

00:12:09

passed #50287375
gitlab-org
rspec-mysql 26 27

00:14:19

passed #50287352
gitlab-org
rspec-mysql 3 27

00:12:19

passed #50287353
gitlab-org
rspec-mysql 4 27

00:14:24

passed #50287354
gitlab-org
rspec-mysql 5 27

00:11:24

passed #50287355
gitlab-org
rspec-mysql 6 27

00:13:46

passed #50287356
gitlab-org
rspec-mysql 7 27

00:13:59

passed #50287357
gitlab-org
rspec-mysql 8 27

00:15:22

passed #50287358
gitlab-org
rspec-mysql 9 27

00:15:17

passed #50287321
gitlab-org
rspec-pg 0 27

00:13:34

passed #50287322
gitlab-org
rspec-pg 1 27

00:16:41

passed #50287331
gitlab-org
rspec-pg 10 27

00:14:09

passed #50287332
gitlab-org
rspec-pg 11 27

00:11:45

passed #50287333
gitlab-org
rspec-pg 12 27

00:13:44

passed #50287334
gitlab-org
rspec-pg 13 27

00:13:34

passed #50287335
gitlab-org
rspec-pg 14 27

00:15:19

passed #50287336
gitlab-org
rspec-pg 15 27

00:15:07

passed #50287337
gitlab-org
rspec-pg 16 27

00:12:59

passed #50287338
gitlab-org
rspec-pg 17 27

00:15:00

passed #50287339
gitlab-org
rspec-pg 18 27

00:13:52

passed #50287340
gitlab-org
rspec-pg 19 27

00:12:31

passed #50287323
gitlab-org
rspec-pg 2 27

00:15:08

passed #50287341
gitlab-org
rspec-pg 20 27

00:15:31

passed #50287342
gitlab-org
rspec-pg 21 27

00:16:05

passed #50287343
gitlab-org
rspec-pg 22 27

00:13:58

passed #50287344
gitlab-org
rspec-pg 23 27

00:09:44

passed #50287345
gitlab-org
rspec-pg 24 27

00:14:00

passed #50287346
gitlab-org
rspec-pg 25 27

00:14:35

passed #50287347
gitlab-org
rspec-pg 26 27

00:18:26

passed #50287324
gitlab-org
rspec-pg 3 27

00:11:56

passed #50287325
gitlab-org
rspec-pg 4 27

00:13:55

passed #50287326
gitlab-org
rspec-pg 5 27

00:12:59

passed #50287327
gitlab-org
rspec-pg 6 27

00:12:49

passed #50287328
gitlab-org
rspec-pg 7 27

00:15:15

passed #50287329
gitlab-org
rspec-pg 8 27

00:14:21

passed #50287330
gitlab-org
rspec-pg 9 27

00:12:36

passed #50287399
sast

00:04:05

passed #50287380
gitlab-org
spinach-mysql 0 3

00:10:55

passed #50287381
gitlab-org
spinach-mysql 1 3

00:11:16

passed #50287382
gitlab-org
spinach-mysql 2 3

00:10:25

passed #50287376
gitlab-org
spinach-pg 0 3

00:11:22

passed #50287377
gitlab-org
spinach-pg 1 3

00:09:17

passed #50287379
gitlab-org
spinach-pg 2 3

00:09:56

passed #50287383
gitlab-org
static-analysis

00:05:15

 
  Post Test
passed #50287404
gitlab-org
coverage

00:01:22

94.63%
passed #50287403
gitlab-org allowed to fail
flaky-examples-check

00:00:43

passed #50287405
gitlab-org
lint:javascript:report

00:01:22

 
  Post Cleanup
manual #50287406
gitlab-org allowed to fail manual
review-docs-cleanup