Skip to content

Sending namespace during fork #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timols merged 3 commits into from
Jun 29, 2018
Merged

Sending namespace during fork #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b40fd1
Sending namespace during fork
gecka May 3, 2018
37bf3ec
Added import_status field for project model
gecka May 3, 2018
fb212a9
Merge branch 'master' into master
timols Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/org/gitlab/api/GitlabAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,9 +1301,8 @@ public GitlabProject createUserProject(Integer userId, String name, String descr
*/
public GitlabProject createFork(String namespace, Integer projectId) throws IOException {
Query query = new Query()
.appendIf("id", projectId)
.append("namespace", namespace);
String tailUrl = GitlabProject.URL + "/" + projectId + "/fork";
.appendIf("namespace", namespace);
String tailUrl = GitlabProject.URL + "/" + projectId + "/fork" + query.toString();
return dispatch().to(tailUrl, GitlabProject.class);
}

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gitlab/api/models/GitlabProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ public class GitlabProject {
@JsonProperty("is_printing_merge_request_link_enabled")
private Boolean printingMergeRequestLinkEnabled;

@JsonProperty("import_status")
private String importStatus;

public Integer getId() {
return id;
}
Expand Down
5 changes: 4 additions & 1 deletion src/test/java/org/gitlab/api/GitlabAPIIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,14 @@ public void testCreateDeleteFork() throws Exception {
false,
false);

String namespace = api.getNamespaces().get(0).getPath();

GitlabProject project = api.createUserProject(gitUser.getId(), projectName);
GitlabProject fork = api.createFork(api.getNamespaces().get(0).getPath(), project);
GitlabProject fork = api.createFork(namespace, project);

assertNotNull(fork);
assertEquals(project.getId(), fork.getForkedFrom().getId());
assertEquals(project.getNamespace(), namespace);

api.deleteProject(project.getId());
api.deleteProject(fork.getId());
Expand Down