@@ -85,20 +85,22 @@ public List<MergeRequest> getMergeRequests(MergeRequestFilter filter, int page,
8585 *
8686 * @param filter a MergeRequestFilter instance with the filter settings
8787 * @param itemsPerPage the number of MergeRequest instances that will be fetched per page
88- * @return all merge requests for the specified project matching the filter
88+ * @return all merge requests for the specified project/group matching the filter
8989 * @throws GitLabApiException if any exception occurs
9090 */
9191 public Pager <MergeRequest > getMergeRequests (MergeRequestFilter filter , int itemsPerPage ) throws GitLabApiException {
9292
9393 MultivaluedMap <String , String > queryParams = (filter != null ? filter .getQueryParams ().asMap () : null );
94- if (filter != null && (filter .getProjectId () != null && filter .getProjectId ().intValue () > 0 ) ||
95- (filter .getIids () != null && filter .getIids ().size () > 0 )) {
94+ if (filter != null && (( filter .getProjectId () != null && filter .getProjectId ().intValue () > 0 ) ||
95+ (filter .getIids () != null && filter .getIids ().size () > 0 ))) {
9696
9797 if (filter .getProjectId () == null || filter .getProjectId ().intValue () == 0 ) {
9898 throw new RuntimeException ("project ID cannot be null or 0" );
9999 }
100100
101101 return (new Pager <MergeRequest >(this , MergeRequest .class , itemsPerPage , queryParams , "projects" , filter .getProjectId (), "merge_requests" ));
102+ } else if (filter != null && filter .getGroupId () != null && filter .getGroupId ().intValue () > 0 ) {
103+ return (new Pager <MergeRequest >(this , MergeRequest .class , itemsPerPage , queryParams , "groups" , filter .getGroupId (), "merge_requests" ));
102104 } else {
103105 return (new Pager <MergeRequest >(this , MergeRequest .class , itemsPerPage , queryParams , "merge_requests" ));
104106 }
0 commit comments