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

..

config

Don't load all of GitLab in mail_room

2016-02-26 18:48:13 -08:00

controllers

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

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

factories

Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master'

2016-04-15 18:07:02 +02:00

features

Merge branch 'fix/unauthorized-access-to-build-data' into 'master'

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

finders

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

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

fixtures

Add support for keyword arguments in label reference method

2016-03-03 10:41:11 +01:00

helpers

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

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

initializers

Ensure Gravatar host looks like an actual host

2016-01-18 14:58:16 +01:00

javascripts

Change js-quick-submit behavior to expect the class on the form

2016-03-02 15:11:15 -05:00

lib

Merge branch 'dev_issue_15331' into 'master'

2016-04-25 15:52:00 -04: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

requests

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

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

routing

Remove Profile::KeysController#new action

2016-03-03 16:13:59 -05:00

services

Merge branch 'fix/private-labels-permissions' into 'master'

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

support

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

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

tasks/gitlab

Merge branch 'drop_db_before_restore' into 'master'

2016-03-23 12:25:06 +01:00

views

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

workers

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

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

factories_spec.rb

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

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

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Original implementation to allow users to subscribe to labels

2016-03-15 17:25:37 +01:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00