Robert SpeicherandTomasz Maczukin 33b59e7f14 Merge branch '18535-confidential-issue-notes' into 'master' ...

Only show notes through JSON on confidential issues that the user has access to

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18535

See merge request !1970

2016-06-14 23:45:01 +02:00

..

assets

Merge branch 'issue_15434' into 'master'

2016-04-25 16:01:48 -04:00

controllers

Merge branch '17298-wiki-xss' into 'master'

2016-06-14 20:06:41 +02:00

finders

Merge branch '18535-confidential-issue-notes' into 'master'

2016-06-14 23:45:01 +02:00

helpers

Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master'

2016-04-26 10:06:43 +02:00

mailers

Merge branch 'feature/issue-move' into 'master'

2016-03-21 16:40:17 +01:00

models

Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master'

2016-04-26 10:06:43 +02:00

services

Merge branch 'rs-notes-privilege-escalation' into 'master'

2016-04-26 16:20:20 -04:00

uploaders

Merge branch 'fix/issue-move-rewrite-uploads' into 'master'

2016-04-01 10:01:22 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

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

views

Merge branch 'fix-impersonation-issue' into 'master'

2016-04-25 16:52:11 -04:00

workers

Merge branch 'issues-show-performance' into 'master'

2016-03-21 16:40:54 +01:00