Unverified Commit 502d03c6 authored by Gautier de Saint Martin Lacaze's avatar Gautier de Saint Martin Lacaze Committed by GitHub
Browse files

Merge pull request #694 from filipowm/master

Add support for ci_config_path and ci_forward_deployment_enabled properties to Projects API
parents 47ef2d9e 9290e578
...@@ -976,6 +976,7 @@ public class ProjectApi extends AbstractApi implements Constants { ...@@ -976,6 +976,7 @@ public class ProjectApi extends AbstractApi implements Constants {
* packagesEnabled (optional) - Enable or disable mvn packages repository feature * packagesEnabled (optional) - Enable or disable mvn packages repository feature
* buildGitStrategy (optional) - set the build git strategy * buildGitStrategy (optional) - set the build git strategy
* buildCoverageRegex (optional) - set build coverage regex * buildCoverageRegex (optional) - set build coverage regex
* ciConfigPath (optional) - Set path to CI configuration file
* squashOption (optional) - set squash option for merge requests * squashOption (optional) - set squash option for merge requests
* *
* @param project the Project instance with the configuration for the new project * @param project the Project instance with the configuration for the new project
...@@ -1024,6 +1025,7 @@ public class ProjectApi extends AbstractApi implements Constants { ...@@ -1024,6 +1025,7 @@ public class ProjectApi extends AbstractApi implements Constants {
.withParam("packages_enabled", project.getPackagesEnabled()) .withParam("packages_enabled", project.getPackagesEnabled())
.withParam("build_git_strategy", project.getBuildGitStrategy()) .withParam("build_git_strategy", project.getBuildGitStrategy())
.withParam("build_coverage_regex", project.getBuildCoverageRegex()) .withParam("build_coverage_regex", project.getBuildCoverageRegex())
.withParam("ci_config_path", project.getCiConfigPath());
.withParam("suggestion_commit_message", project.getSuggestionCommitMessage()) .withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
.withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge()) .withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge())
.withParam("squash_option", project.getSquashOption()); .withParam("squash_option", project.getSquashOption());
...@@ -1224,13 +1226,14 @@ public class ProjectApi extends AbstractApi implements Constants { ...@@ -1224,13 +1226,14 @@ public class ProjectApi extends AbstractApi implements Constants {
* packagesEnabled (optional) - Enable or disable mvn packages repository feature * packagesEnabled (optional) - Enable or disable mvn packages repository feature
* buildGitStrategy (optional) - set the build git strategy * buildGitStrategy (optional) - set the build git strategy
* buildCoverageRegex (optional) - set build coverage regex * buildCoverageRegex (optional) - set build coverage regex
* ciConfigPath (optional) - Set path to CI configuration file
* ciForwardDeploymentEnabled (optional) - When a new deployment job starts, skip older deployment jobs that are still pending
* squashOption (optional) - set squash option for merge requests * squashOption (optional) - set squash option for merge requests
* *
* 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
* initialize_with_readme * 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
...@@ -1271,6 +1274,8 @@ public class ProjectApi extends AbstractApi implements Constants { ...@@ -1271,6 +1274,8 @@ public class ProjectApi extends AbstractApi implements Constants {
.withParam("packages_enabled", project.getPackagesEnabled()) .withParam("packages_enabled", project.getPackagesEnabled())
.withParam("build_git_strategy", project.getBuildGitStrategy()) .withParam("build_git_strategy", project.getBuildGitStrategy())
.withParam("build_coverage_regex", project.getBuildCoverageRegex()) .withParam("build_coverage_regex", project.getBuildCoverageRegex())
.withParam("ci_config_path", project.getCiConfigPath())
.withParam("ci_forward_deployment_enabled", project.getCiForwardDeploymentEnabled());
.withParam("merge_method", project.getMergeMethod()) .withParam("merge_method", project.getMergeMethod())
.withParam("suggestion_commit_message", project.getSuggestionCommitMessage()) .withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
.withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge()) .withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge())
......
...@@ -100,6 +100,8 @@ public class Project { ...@@ -100,6 +100,8 @@ public class Project {
private Boolean canCreateMergeRequestIn; private Boolean canCreateMergeRequestIn;
private Status importStatus; private Status importStatus;
private Integer ciDefaultGitDepth; private Integer ciDefaultGitDepth;
private Boolean ciForwardDeploymentEnabled;
private String ciConfigPath;
private Boolean removeSourceBranchAfterMerge; private Boolean removeSourceBranchAfterMerge;
private Boolean autoDevopsEnabled; private Boolean autoDevopsEnabled;
private AutoDevopsDeployStrategy autoDevopsDeployStrategy; private AutoDevopsDeployStrategy autoDevopsDeployStrategy;
...@@ -782,6 +784,22 @@ public class Project { ...@@ -782,6 +784,22 @@ public class Project {
this.ciDefaultGitDepth = ciDefaultGitDepth; this.ciDefaultGitDepth = ciDefaultGitDepth;
} }
public Boolean getCiForwardDeploymentEnabled() {
return ciForwardDeploymentEnabled;
}
public void setCiForwardDeploymentEnabled(Boolean ciForwardDeploymentEnabled) {
this.ciForwardDeploymentEnabled = ciForwardDeploymentEnabled;
}
public String getCiConfigPath() {
return ciConfigPath;
}
public void setCiConfigPath(String ciConfigPath) {
this.ciConfigPath = ciConfigPath;
}
public Boolean getRemoveSourceBranchAfterMerge() { public Boolean getRemoveSourceBranchAfterMerge() {
return removeSourceBranchAfterMerge; return removeSourceBranchAfterMerge;
} }
......
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