Robert SpeicherandYorick Peterse 69821f1a01 Merge branch 'license-templates-and-api-12804' into 'master' ...

License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660

2016-04-20 10:50:27 +02:00

..

assets

Merge branch 'license-templates-and-api-12804' into 'master'

2016-04-20 10:50:27 +02:00

controllers

Merge branch 'feature/raw-trace-output' into 'master'

2016-04-20 10:49:56 +02:00

finders

Standardised the output of the JSON to always include the name

2016-03-29 11:59:13 +01:00

helpers

Merge branch 'license-templates-and-api-12804' into 'master'

2016-04-20 10:50:27 +02:00

mailers

format merge request references properly

2016-04-19 19:18:56 +02:00

models

Merge branch 'license-templates-and-api-12804' into 'master'

2016-04-20 10:50:27 +02:00

services

Merge branch 'slack_wiki_notifications' into 'master'

2016-04-20 10:49:31 +02:00

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Merge branch 'license-templates-and-api-12804' into 'master'

2016-04-20 10:50:27 +02:00

workers

Merge branch 'feature/system_hook_push' into 'master'

2016-04-19 09:34:47 +00:00