Merge branch '5263-add-column-to-admin-makups-screen' into 'dev_cooperatic'

admin makups, display shift type in column

See merge request !250
Status Job ID Name Coverage
  Test
failed #5624
lint:js

00:20

failed #5625
unit:django

01:09

 
HEAD is now at 2751827 Merge branch '5263-add-column-to-admin-makups-screen' into 'dev_cooperatic'
Checking out 2751827f as dev_cooperatic...
Skipping Git submodules setup
Checking cache for default...
No URL provided, cache will be not downloaded from shared cache server. Instead a local version of cache will be extracted.
Successfully extracted cache
shell not found
shell not found
ERROR: Job failed: exit code 1
Test lint:js
npm ERR! Exit status 1
npm ERR!
npm ERR! Failed at the third-party@1.0.0 lint script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
npm ERR! /root/.npm/_logs/2023-11-08T15_38_34_688Z-debug.log
make: *** [Makefile:9: lint-js] Error 1
ERROR: Job failed: exit code 1