merge request id	253
Titel	LL-420 code quality rename credit controller
Beschreibung
Status	merged
Created at	2020-09-15T06:40:31.240Z
Updated at	2020-09-18T13:51:26.807Z
Source branch	feature/LL-420-Code_quality_Rename_Credit_Controller
Target branch	develop
Author	Sascha Immig
Assignee	Gregor Gabriel

Discussion notes

added 1 commit 75999c15 - corrected merge error in routes Compare with previous version	Sascha Immig	2020-09-15T06:45:20.483Z
assigned to @gabrielg	Sascha Immig	2020-09-15T11:08:14.734Z
added 40 commits 75999c15...e1687b18 - 39 commits from branch develop 4578b7fe - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2020-09-18T13:42:59.573Z
enabled an automatic merge when the pipeline for 4578b7fe847c830d9a11239b59948c473205943e succeeds	Gregor Gabriel	2020-09-18T13:44:51.982Z
merged	Gregor Gabriel	2020-09-18T13:51:26.878Z
mentioned in commit c4d58e402aa1791873932d8fd7dda9ce98029352	Gregor Gabriel	2020-09-18T13:51:27.128Z

Merge Commits

Title	Id	Author	Created at	Message
LL-420: Rename Credit Controller	38c2a20b72a639aa1559f9d90e54c0049b769667	gerlachm	2020-09-14T07:44:48.000Z	LL-420: Rename Credit Controller
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	4578b7fe847c830d9a11239b59948c473205943e	TUV\gabrielg	2020-09-18T13:42:37.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-420-Code_quality_Rename_Credit_Controller # Conflicts: # routes/web.php
corrected merge error in routes	75999c15f7af42da53eb0bf4381940384db24d57	TUV\immigs	2020-09-15T06:44:40.000Z	corrected merge error in routes
updated gitlad-ci to get pipeline running again	fab7006e0fa4a55ee873bc79193e5858153f7421	TUV\immigs	2020-09-14T17:42:12.000Z	updated gitlad-ci to get pipeline running again