Robert SpeicherandRobert Speicher 25670ee440 Merge branch '18569-fix-diff-note-position' into 'master' ...

Restore old behavior around diff notes to outdated discussions

Fixes #18569

See merge request !4870

2016-06-23 18:20:00 -04:00

..

assets

Merge branch 'fix-bulk-assign' into 'master'

2016-06-23 18:17:22 -04:00

controllers

Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'

2016-06-22 15:50:04 +02:00

finders

Merge branch 'fix-todos-counters' into 'master'

2016-06-17 16:03:15 -04:00

helpers

Merge branch 'remove-banzai-pre-process' into 'master'

2016-06-21 14:25:30 -04:00

mailers

Merge branch '18757-fix' into 'master'

2016-06-21 12:02:44 -04:00

models

Merge branch '18569-fix-diff-note-position' into 'master'

2016-06-23 18:20:00 -04:00

services

Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'

2016-06-22 15:50:04 +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 'merge-settings-help-link' into 'master'

2016-06-23 14:39:24 -04:00

workers

Merge branch 'repo-check-require-push-events' into 'master'

2016-06-17 16:03:28 -04:00