diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-29 09:09:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-29 09:09:15 +0000 |
| commit | 290b2ab01becf60d9eaf1094b620f1fb32fdccb3 (patch) | |
| tree | c0bde0f7c121b5bc878e858dbaaf904f24d9ee6b /lib/api/v3 | |
| parent | 5169d58a9dd60d54cd40f325431658b1436497c2 (diff) | |
| download | gitlab-ce-290b2ab01becf60d9eaf1094b620f1fb32fdccb3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/v3')
| -rw-r--r-- | lib/api/v3/github.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/api/v3/github.rb b/lib/api/v3/github.rb index 7938339e1b1..29e4a79110f 100644 --- a/lib/api/v3/github.rb +++ b/lib/api/v3/github.rb @@ -197,16 +197,13 @@ module API # Self-hosted Jira (tested on 7.11.1) requests this endpoint right # after fetching branches. - # rubocop: disable CodeReuse/ActiveRecord get ':namespace/:project/events' do user_project = find_project_with_access(params) merge_requests = authorized_merge_requests_for_project(user_project) - merge_requests = merge_requests.preload(:author, :assignees, :metrics, source_project: :namespace, target_project: :namespace) present paginate(merge_requests), with: ::API::Github::Entities::PullRequestEvent end - # rubocop: enable CodeReuse/ActiveRecord params do use :project_full_path |