merge request id	147
Titel	Feature/ll 163 add columns to roles
Beschreibung
Status	merged
Created at	2020-01-20T09:53:44.231Z
Updated at	2020-02-06T13:52:27.953Z
Source branch	feature/LL-163_add_columns_to_roles
Target branch	develop
Author	Zoltan Schnepf
Assignee	Sascha Immig

Discussion notes

Wofür hast du hier einen separaten guard angelegt? Brauchst du nicht lediglich die Group bzw. Position Klasse an der Stelle? Du kannst die custom provider und guards entfernen und statt dessen einfach die Group bzw. Position Klasse zurück geben.	Marcel Pociot	2020-01-31T13:36:55.949Z
assigned to @schnepfz	Marcel Pociot	2020-01-31T13:37:04.212Z
changed this line in version 2 of the diff	Zoltan Schnepf	2020-02-06T11:14:26.198Z
resolved all discussions	Zoltan Schnepf	2020-02-06T11:14:26.352Z
added 15 commits 4ce5811b...29835f33 - 13 commits from branch develop 99c601de - WIP 4de08cda - Merge branch 'develop' into feature/LL-163_add_columns_to_roles Compare with previous version	Zoltan Schnepf	2020-02-06T11:14:26.498Z
marked as a **Work In Progress** from 99c601de1d77f68b56e2d8e6fa56abc247eb519c	Zoltan Schnepf	2020-02-06T11:14:26.810Z
korrigiert	Zoltan Schnepf	2020-02-06T11:14:35.315Z
resolved all discussions	Zoltan Schnepf	2020-02-06T11:14:41.218Z
assigned to @immigs	Zoltan Schnepf	2020-02-06T11:32:08.996Z
added 20 commits 4de08cda...5b099813 - 19 commits from branch develop 89f547c3 - Merge branch 'develop' into feature/LL-163_add_columns_to_roles Compare with previous version	Sascha Immig	2020-02-06T12:45:13.705Z
added 1 commit afa8b5e7 - re-added api guard Compare with previous version	Sascha Immig	2020-02-06T13:40:30.726Z
unmarked as a **Work In Progress**	Sascha Immig	2020-02-06T13:40:53.338Z
enabled an automatic merge when the pipeline for afa8b5e73713851f8bddf4b0816ae767f8a9fc31 succeeds	Sascha Immig	2020-02-06T13:40:56.555Z
mentioned in commit a7b210a2815ebeed32471ceb3d5889987560a0e7	Sascha Immig	2020-02-06T13:52:27.886Z
merged	Sascha Immig	2020-02-06T13:52:28.031Z

Merge Commits

Title	Id	Author	Created at	Message
LL-163 function users overridden	4ce5811b7752fc611964b9b4eba89e07eb6fee83	zschnepf	2020-01-20T09:30:24.000Z	LL-163 function users overridden
Merge branch 'develop' into feature/LL-163_add_columns_to_roles	4de08cdad458d8d884a5d64036ca73552826d479	zschnepf	2020-02-06T11:13:52.000Z	Merge branch 'develop' into feature/LL-163_add_columns_to_roles
Merge branch 'develop' into feature/LL-163_add_columns_to_roles	89f547c3b22be7778ac05fe805959bfd028bd487	TUV\immigs	2020-02-06T12:45:01.000Z	Merge branch 'develop' into feature/LL-163_add_columns_to_roles # Conflicts: # app/Models/Group.php # package-lock.json # package.json
WIP	99c601de1d77f68b56e2d8e6fa56abc247eb519c	zschnepf	2020-02-03T10:20:08.000Z	WIP
Merge branch 'develop' into feature/LL-163_add_columns_to_roles	9bc753842d6ac38fb06c176ecf000aaffc259049	zschnepf	2019-12-12T15:01:29.000Z	Merge branch 'develop' into feature/LL-163_add_columns_to_roles
re-added api guard	afa8b5e73713851f8bddf4b0816ae767f8a9fc31	TUV\immigs	2020-02-06T13:40:14.000Z	re-added api guard
Merge branch 'develop' into feature/LL-163_add_columns_to_roles	c0cd9dd921171819c82bdd854ff6b7a935af3803	zschnepf	2019-12-19T12:06:56.000Z	Merge branch 'develop' into feature/LL-163_add_columns_to_roles
Merge branch 'develop' into feature/LL-163_add_columns_to_roles	d17b3a76c5e3435c0faec210ff1f633c54969a7c	zschnepf	2020-01-15T14:04:54.000Z	Merge branch 'develop' into feature/LL-163_add_columns_to_roles