Commit 333f1e56 authored by mdeknowis's avatar mdeknowis Committed by Greg Messner
Browse files

Add support for resolve_outdated_diff_discussions in Project (#263)

* Add support for resolve_outdated_diff_discussions in Project
* Add support for initialize_with_readme in Project
parent 32801a00
...@@ -655,6 +655,8 @@ public class ProjectApi extends AbstractApi implements Constants { ...@@ -655,6 +655,8 @@ public class ProjectApi extends AbstractApi implements Constants {
* repositoryStorage (optional) - Which storage shard the repository is on. Available only to admins * repositoryStorage (optional) - Which storage shard the repository is on. Available only to admins
* approvalsBeforeMerge (optional) - How many approvers should approve merge request by default * approvalsBeforeMerge (optional) - How many approvers should approve merge request by default
* printingMergeRequestLinkEnabled (optional) - Show link to create/view merge request when pushing from the command line * printingMergeRequestLinkEnabled (optional) - Show link to create/view merge request when pushing from the command line
* resolveOutdatedDiffDiscussions (optional) - Automatically resolve merge request diffs discussions on lines changed with a push
* initialize_with_readme (optional) - Initialize project with README file
* *
* @param project the Project instance with the configuration for the new project * @param project the Project instance with the configuration for the new project
* @param importUrl the URL to import the repository from * @param importUrl the URL to import the repository from
...@@ -696,7 +698,9 @@ public class ProjectApi extends AbstractApi implements Constants { ...@@ -696,7 +698,9 @@ public class ProjectApi extends AbstractApi implements Constants {
.withParam("repository_storage", project.getRepositoryStorage()) .withParam("repository_storage", project.getRepositoryStorage())
.withParam("approvals_before_merge", project.getApprovalsBeforeMerge()) .withParam("approvals_before_merge", project.getApprovalsBeforeMerge())
.withParam("import_url", importUrl) .withParam("import_url", importUrl)
.withParam("printing_merge_request_link_enabled", project.getPrintingMergeRequestLinkEnabled()); .withParam("printing_merge_request_link_enabled", project.getPrintingMergeRequestLinkEnabled())
.withParam("resolve_outdated_diff_discussions", project.getResolveOutdatedDiffDiscussions())
.withParam("initialize_with_readme", project.getInitializeWithReadme());
if (isApiVersion(ApiVersion.V3)) { if (isApiVersion(ApiVersion.V3)) {
boolean isPublic = (project.getPublic() != null ? project.getPublic() : project.getVisibility() == Visibility.PUBLIC); boolean isPublic = (project.getPublic() != null ? project.getPublic() : project.getVisibility() == Visibility.PUBLIC);
...@@ -889,12 +893,14 @@ public class ProjectApi extends AbstractApi implements Constants { ...@@ -889,12 +893,14 @@ public class ProjectApi extends AbstractApi implements Constants {
* repositoryStorage (optional) - Which storage shard the repository is on. Available only to admins * repositoryStorage (optional) - Which storage shard the repository is on. Available only to admins
* approvalsBeforeMerge (optional) - How many approvers should approve merge request by default * approvalsBeforeMerge (optional) - How many approvers should approve merge request by default
* printingMergeRequestLinkEnabled (optional) - Show link to create/view merge request when pushing from the command line * printingMergeRequestLinkEnabled (optional) - Show link to create/view merge request when pushing from the command line
* resolveOutdatedDiffDiscussions (optional) - Automatically resolve merge request diffs discussions on lines changed with a push
* *
* NOTE: The following parameters specified by the GitLab API edit project are not supported: * NOTE: The following parameters specified by the GitLab API edit project are not supported:
* import_url * import_url
* tag_list array * tag_list array
* avatar * avatar
* ci_config_path * ci_config_path
* initialize_with_readme
* *
* @param project the Project instance with the configuration for the new project * @param project the Project instance with the configuration for the new project
* @return a Project instance with the newly updated project info * @return a Project instance with the newly updated project info
...@@ -936,7 +942,8 @@ public class ProjectApi extends AbstractApi implements Constants { ...@@ -936,7 +942,8 @@ public class ProjectApi extends AbstractApi implements Constants {
.withParam("request_access_enabled", project.getRequestAccessEnabled()) .withParam("request_access_enabled", project.getRequestAccessEnabled())
.withParam("repository_storage", project.getRepositoryStorage()) .withParam("repository_storage", project.getRepositoryStorage())
.withParam("approvals_before_merge", project.getApprovalsBeforeMerge()) .withParam("approvals_before_merge", project.getApprovalsBeforeMerge())
.withParam("printing_merge_request_link_enabled", project.getPrintingMergeRequestLinkEnabled()); .withParam("printing_merge_request_link_enabled", project.getPrintingMergeRequestLinkEnabled())
.withParam("resolve_outdated_diff_discussions", project.getResolveOutdatedDiffDiscussions());
if (isApiVersion(ApiVersion.V3)) { if (isApiVersion(ApiVersion.V3)) {
formData.withParam("visibility_level", project.getVisibilityLevel()); formData.withParam("visibility_level", project.getVisibilityLevel());
......
...@@ -85,7 +85,9 @@ public class Project { ...@@ -85,7 +85,9 @@ public class Project {
private String webUrl; private String webUrl;
private Boolean wikiEnabled; private Boolean wikiEnabled;
private Boolean printingMergeRequestLinkEnabled; private Boolean printingMergeRequestLinkEnabled;
private Boolean resolveOutdatedDiffDiscussions;
private ProjectStatistics statistics; private ProjectStatistics statistics;
private Boolean initializeWithReadme;
public Integer getApprovalsBeforeMerge() { public Integer getApprovalsBeforeMerge() {
return approvalsBeforeMerge; return approvalsBeforeMerge;
...@@ -593,6 +595,32 @@ public class Project { ...@@ -593,6 +595,32 @@ public class Project {
return (this); return (this);
} }
public Boolean getResolveOutdatedDiffDiscussions() {
return resolveOutdatedDiffDiscussions;
}
public void setResolveOutdatedDiffDiscussions(Boolean resolveOutdatedDiffDiscussions) {
this.resolveOutdatedDiffDiscussions = resolveOutdatedDiffDiscussions;
}
public Project withResolveOutdatedDiffDiscussions(boolean resolveOutdatedDiffDiscussions) {
this.resolveOutdatedDiffDiscussions = resolveOutdatedDiffDiscussions;
return (this);
}
public Boolean getInitializeWithReadme() {
return initializeWithReadme;
}
public void setInitializeWithReadme(Boolean initializeWithReadme) {
this.initializeWithReadme = initializeWithReadme;
}
public Project withInitializeWithReadme(boolean initializeWithReadme) {
this.initializeWithReadme = initializeWithReadme;
return (this);
}
public ProjectStatistics getStatistics() { public ProjectStatistics getStatistics() {
return statistics; return statistics;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment