squashed merge and fixed conflicts

39 jobs for feature/project-export in 516 minutes and 5 seconds (queued for 18 seconds)
Status Job ID Name Coverage
  Prepare
passed #1840364
knapsack

00:03:37

 
  Test
passed #1840458
license_finder

00:02:31

passed #1840454
rake brakeman

00:04:14

passed #1840457
rake db:migrate:reset

00:02:46

passed #1840456
rake flay

00:02:57

passed #1840455
rake flog

00:02:39

passed #1840452
rake scss_lint

00:02:19

passed #1840406
rspec 0 20

00:20:51

passed #1840412
rspec 1 20

00:14:14

passed #1840428
rspec 10 20

00:17:50

passed #1840429
rspec 11 20

00:20:52

passed #1840430
rspec 12 20

00:19:12

passed #1840431
rspec 13 20

00:19:48

passed #1840432
rspec 14 20

00:17:39

passed #1840433
rspec 15 20

00:18:49

passed #1840434
rspec 16 20

00:20:59

passed #1840435
rspec 17 20

00:12:18

passed #1840436
rspec 18 20

00:18:36

passed #1840437
rspec 19 20

00:13:12

passed #1840414
rspec 2 20

00:17:13

passed #1840416
rspec 3 20

00:16:28

passed #1840417
rspec 4 20

00:19:33

passed #1840420
rspec 5 20

00:18:26

passed #1840424
rspec 6 20

00:12:38

passed #1840425
rspec 7 20

00:17:32

passed #1840426
rspec 8 20

00:14:41

passed #1840427
rspec 9 20

00:19:10

passed #1840451
rubocop

00:03:53

passed #1840438
spinach 0 10

00:10:16

passed #1840439
spinach 1 10

00:11:30

passed #1840440
spinach 2 10

00:12:47

passed #1840442
spinach 3 10

00:13:07

passed #1840443
spinach 4 10

00:18:34

passed #1840444
spinach 5 10

00:15:23

passed #1840445
spinach 6 10

00:11:21

passed #1840446
spinach 7 10

00:13:59

passed #1840447
spinach 8 10

00:13:31

passed #1840448
spinach 9 10

00:16:16

passed #1840450
teaspoon

00:04:04