Robert Speicher 8b562e2ae6 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 21:31:02 +00:00

..

assets

Merge branch '18857-new-label-page-needs-work-on-mobile' into 'master'

2016-06-23 05:07:04 +00:00

controllers

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

2016-06-22 01:15:29 +00:00

finders

Ensure Todos counters doesn't count Todos for projects pending delete

2016-06-17 16:17:43 -03:00

helpers

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

2016-06-21 18:23:51 +00:00

mailers

Fallback to group's owners/masters when a project has none

2016-06-20 12:10:37 +02:00

models

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

2016-06-23 21:31:02 +00:00

services

Merge branch 'fix-auto-mr-close' into 'master'

2016-06-22 01:18:12 +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

Fix merge requests project settings help link anchor.

2016-06-23 16:49:58 +01:00

workers

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

2016-06-17 19:14:43 +00:00