diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2018-10-01 19:34:21 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2018-10-01 19:34:21 +0300 |
| commit | a04c4ae3befbd366e53b2dc6ae6ab92e53eba4c5 (patch) | |
| tree | cc937a24bd5f2803f7a99ce93839c6326475ce9a /app/finders | |
| parent | e5d3a75aac4f0bb287699b21f3a56b8bfe499665 (diff) | |
| parent | 32930ecd5289768ae7b070388da7e499c77a62d2 (diff) | |
Merge branch 'fix-events-finder-incomplete' into 'master'
[master] Redact events shown in the events API
See merge request gitlab/gitlabhq!2514
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/events_finder.rb | 1 | ||||
| -rw-r--r-- | app/finders/user_recent_events_finder.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/finders/events_finder.rb b/app/finders/events_finder.rb index fd7aeca0d8b..2e82bda8730 100644 --- a/app/finders/events_finder.rb +++ b/app/finders/events_finder.rb @@ -12,6 +12,7 @@ class EventsFinder # Arguments: # source - which user or project to looks for events on # current_user - only return events for projects visible to this user + # WARNING: does not consider project feature visibility! # params: # action: string # target_type: string diff --git a/app/finders/user_recent_events_finder.rb b/app/finders/user_recent_events_finder.rb index a4daf5b5841..eeca5026da1 100644 --- a/app/finders/user_recent_events_finder.rb +++ b/app/finders/user_recent_events_finder.rb @@ -3,6 +3,7 @@ # Get user activity feed for projects common for a user and a logged in user # # - current_user: The user viewing the events +# WARNING: does not consider project feature visibility! # - user: The user for which to load the events # - params: # - offset: The page of events to return |