Merge remote-tracking branch 'origin/main' into 6.x

gitlab4j · Sep 6, 2023 · 16de67d · 16de67d
2 parents 5746822 + ff037bd
commit 16de67d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/org/gitlab4j/api/Constants.java b/src/main/java/org/gitlab4j/api/Constants.java
@@ -758,7 +758,7 @@ public String toString() {
      */
     public enum GroupSearchScope {
 
-        PROJECTS, ISSUES, MERGE_REQUESTS, MILESTONES, USERS;
+        PROJECTS, ISSUES, MERGE_REQUESTS, MILESTONES, WIKI_BLOBS, COMMITS, BLOBS, NOTES, USERS;
 
         private static JacksonJsonEnumHelper<GroupSearchScope> enumHelper = new JacksonJsonEnumHelper<>(GroupSearchScope.class);
 

diff --git a/src/main/java/org/gitlab4j/api/SearchApi.java b/src/main/java/org/gitlab4j/api/SearchApi.java
@@ -184,6 +184,19 @@ public Pager<?> groupSearch(Object groupIdOrPath, GroupSearchScope scope, String
                 return (new Pager<Milestone>(this, Milestone.class, itemsPerPage, formData.asMap(),
                         "groups", getGroupIdOrPath(groupIdOrPath), "search"));
 
+            case BLOBS:
+            case WIKI_BLOBS:
+                return (new Pager<SearchBlob>(this, SearchBlob.class, itemsPerPage, formData.asMap(),
+                    "groups", getGroupIdOrPath(groupIdOrPath), "search"));
+
+            case COMMITS:
+                return (new Pager<Commit>(this, Commit.class, itemsPerPage, formData.asMap(),
+                    "groups", getGroupIdOrPath(groupIdOrPath), "search"));
+
+            case NOTES:
+                return (new Pager<Note>(this, Note.class, itemsPerPage, formData.asMap(),
+                    "groups", getGroupIdOrPath(groupIdOrPath), "search"));
+
             case USERS:
                 return (new Pager<User>(this, User.class, itemsPerPage, formData.asMap(),
                         "groups", getGroupIdOrPath(groupIdOrPath), "search"));