Robert Speicher 3f4715322e Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' ...

Fix editing notes on a merge request diff

Fixes #3910

See merge request !2041

2015-12-10 19:22:53 +00:00

..

assets

Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master'

2015-12-10 19:22:53 +00:00

controllers

Use devise paranoid mode and ensure the same message is returned every time

2015-12-09 18:40:37 -06:00

finders

sort milestones by due_date

2015-12-03 08:53:34 -06:00

helpers

Merge branch 'master' into tmp-reference-pipeline-and-caching

2015-12-10 14:04:34 +01:00

mailers

Migrate mailers to ActiveJob

2015-11-26 17:03:43 +02:00

models

Merge remote-tracking branch 'origin/emoji_edit_disallow'

2015-12-10 19:40:18 +01:00

services

Merge branch 'master' into merge-if-green

2015-12-09 09:00:25 +01:00

uploaders

Expose artifacts path

2015-11-23 13:05:22 +01:00

validators

Inline Gitlab::Blacklist in NamespaceValidator

2015-12-07 16:57:26 -05:00

views

Merge branch 'tmp-reference-pipeline-and-caching' into 'master'

2015-12-10 14:34:12 +00:00

workers

Merge branch 'master' into zj/gitlab-ce-merge-if-green

2015-12-08 13:43:45 +01:00