diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-21 10:27:10 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-08-21 10:27:10 +0300 |
commit | edf7d1d4c785618ea021d5fe9782c1e2cea11d9b (patch) | |
tree | 8592b0124499bb748e7b0f5f38579c824edfc050 /lib | |
parent | b755753c0c7c5ea3e803e4479ae14ef373d75067 (diff) | |
parent | 8aed9f08fc681d5653c2bc4b688950caf525579b (diff) |
Merge branch 'fix_events_permission_#49255' into 'master'
Add authenticate to events api. fix #49255
Closes #49255
See merge request gitlab-org/gitlab-ce!20627
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/events.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/api/events.rb b/lib/api/events.rb index fc4ba5a3188..a415508a632 100644 --- a/lib/api/events.rb +++ b/lib/api/events.rb @@ -1,6 +1,7 @@ module API class Events < Grape::API include PaginationParams + include APIGuard helpers do params :event_filter_params do @@ -24,6 +25,8 @@ module API end resource :events do + allow_access_with_scope :read_user, if: -> (request) { request.get? } + desc "List currently authenticated user's events" do detail 'This feature was introduced in GitLab 9.3.' success Entities::Event @@ -46,6 +49,8 @@ module API requires :id, type: String, desc: 'The ID or Username of the user' end resource :users do + allow_access_with_scope :read_user, if: -> (request) { request.get? } + desc 'Get the contribution events of a specified user' do detail 'This feature was introduced in GitLab 8.13.' success Entities::Event |