Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jmini committed Apr 12, 2024
2 parents 13533a4 + ed0ebb6 commit 264884a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/main/java/org/gitlab4j/api/ImportExportApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ public ImportStatus startImport(Object namespaceIdOrPath, File exportFile, Strin
.withParam("packages_enabled", overrideParams.getPackagesEnabled())
.withParam("build_git_strategy", overrideParams.getBuildGitStrategy())
.withParam("build_coverage_regex", overrideParams.getBuildCoverageRegex())
.withParam("squash_option", overrideParams.getSquashOption());
.withParam("squash_option", overrideParams.getSquashOption())
.withParam("name", overrideParams.getName());
}

Response response = upload(Response.Status.CREATED, "file", exportFile, null, formData, url);
Expand All @@ -251,7 +252,7 @@ public ImportStatus startImport(Object namespaceIdOrPath, File exportFile, Strin
*
* <pre><code>GitLab Endpoint: GET /projects/:id/import</code></pre>
*
* @param projectIdOrPath the new (imported) project identifier in the form of an Long(ID), String(path), or Project instance
* @param projectIdOrPath the new (imported) project identifier in the form of an Long(ID), String(path), or Project instance
* @return an ImportStatus instance holding information on the import status
* @throws GitLabApiException if any exception occurs
*/
Expand Down

0 comments on commit 264884a

Please sign in to comment.