Robert Speicher fcd9f90641 Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master' ...

Fix error when editing an issuable with a task list

Closes #18712

See merge request !4751

2016-06-17 16:44:08 +00:00

..

assets

Merge branch 'contrib-calendar-colors' into 'master'

2016-06-17 16:07:41 +00:00

controllers

Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master'

2016-06-17 15:41:59 +00:00

finders

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

helpers

Merge branch 'template_dropdown' into 'master'

2016-06-16 17:29:45 +00:00

mailers

fixed merge conflicts on UI branch

2016-06-16 15:01:27 +02:00

models

Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master'

2016-06-17 15:41:59 +00:00

services

Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master'

2016-06-17 16:44:08 +00: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 '18724-dont-show-leave-project-to-group-member' into 'master'

2016-06-17 15:42:49 +00:00

workers

fixed merge conflicts on UI branch

2016-06-16 15:01:27 +02:00