Robert SpeicherandTomasz Maczukin ea13df6dd9 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-15 00:03:17 +02:00

..

assets

Merge branch 'issue_18102' into 'master'

2016-06-02 13:17:17 -04:00

controllers

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

2016-06-14 22:26:03 +02:00

finders

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

2016-06-15 00:03:17 +02:00

helpers

Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into 'master'

2016-06-02 13:46:06 +02:00

mailers

Syntax-highlight diffs in push emails

2016-05-17 13:23:17 +01:00

models

Merge branch 'fix/incremental-trace-update-api' into 'master'

2016-06-14 22:20:57 +02:00

services

Merge branch 'container-registry-token-ttl' into 'master'

2016-06-02 13:39:56 +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 'gh-disable-webhooks'

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

workers

Merge branch '17464-backport-email-syntax-highlighting' into 'master'

2016-05-19 21:12:53 +00:00