diff --git a/docs/EditRepoOption.md b/docs/EditRepoOption.md index 7827cdc..a478d0b 100644 --- a/docs/EditRepoOption.md +++ b/docs/EditRepoOption.md @@ -3,6 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**allowFastForwardOnlyMerge** | **Boolean** | either `true` to allow fast-forward-only merging pull requests, or `false` to prevent fast-forward-only merging. | [optional] **allowManualMerge** | **Boolean** | either `true` to allow mark pr as merged manually, or `false` to prevent it. | [optional] **allowMergeCommits** | **Boolean** | either `true` to allow merging pull requests with a merge commit, or `false` to prevent merging pull requests with merge commits. | [optional] **allowRebase** | **Boolean** | either `true` to allow rebase-merging pull requests, or `false` to prevent rebase-merging. | [optional] @@ -14,7 +15,7 @@ Name | Type | Description | Notes **defaultAllowMaintainerEdit** | **Boolean** | set to `true` to allow edits from maintainers by default | [optional] **defaultBranch** | **String** | sets the default branch for this repository. | [optional] **defaultDeleteBranchAfterMerge** | **Boolean** | set to `true` to delete pr branch after merge by default | [optional] -**defaultMergeStyle** | **String** | set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", or \"squash\". | [optional] +**defaultMergeStyle** | **String** | set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", \"squash\", or \"fast-forward-only\". | [optional] **description** | **String** | a short description of the repository. | [optional] **enablePrune** | **Boolean** | enable prune - remove obsolete remote-tracking references | [optional] **externalTracker** | [**ExternalTracker**](ExternalTracker.md) | | [optional] diff --git a/docs/MergePullRequestOption.md b/docs/MergePullRequestOption.md index 24e6d16..d6555d3 100644 --- a/docs/MergePullRequestOption.md +++ b/docs/MergePullRequestOption.md @@ -20,4 +20,5 @@ MERGE | "merge" REBASE | "rebase" REBASE_MERGE | "rebase-merge" SQUASH | "squash" +FAST_FORWARD_ONLY | "fast-forward-only" MANUALLY_MERGED | "manually-merged" diff --git a/docs/Repository.md b/docs/Repository.md index a0d451b..4170bba 100644 --- a/docs/Repository.md +++ b/docs/Repository.md @@ -3,6 +3,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**allowFastForwardOnlyMerge** | **Boolean** | | [optional] **allowMergeCommits** | **Boolean** | | [optional] **allowRebase** | **Boolean** | | [optional] **allowRebaseExplicit** | **Boolean** | | [optional] diff --git a/src/main/java/org/gitnex/tea4j/v2/models/EditRepoOption.java b/src/main/java/org/gitnex/tea4j/v2/models/EditRepoOption.java index c301ccb..594b302 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/EditRepoOption.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/EditRepoOption.java @@ -22,6 +22,9 @@ import java.util.Objects; public class EditRepoOption implements Serializable { private static final long serialVersionUID = 1L; + @SerializedName("allow_fast_forward_only_merge") + private Boolean allowFastForwardOnlyMerge = null; + @SerializedName("allow_manual_merge") private Boolean allowManualMerge = null; @@ -112,6 +115,29 @@ public class EditRepoOption implements Serializable { @SerializedName("website") private String website = null; + public EditRepoOption allowFastForwardOnlyMerge(Boolean allowFastForwardOnlyMerge) { + this.allowFastForwardOnlyMerge = allowFastForwardOnlyMerge; + return this; + } + + /** + * either `true` to allow fast-forward-only merging pull requests, or `false` + * to prevent fast-forward-only merging. + * + * @return allowFastForwardOnlyMerge + */ + @Schema( + description = + "either `true` to allow fast-forward-only merging pull requests, or `false` to prevent" + + " fast-forward-only merging.") + public Boolean isAllowFastForwardOnlyMerge() { + return allowFastForwardOnlyMerge; + } + + public void setAllowFastForwardOnlyMerge(Boolean allowFastForwardOnlyMerge) { + this.allowFastForwardOnlyMerge = allowFastForwardOnlyMerge; + } + public EditRepoOption allowManualMerge(Boolean allowManualMerge) { this.allowManualMerge = allowManualMerge; return this; @@ -354,14 +380,14 @@ public class EditRepoOption implements Serializable { /** * set to a merge style to be used by this repository: \"merge\", \"rebase\", - * \"rebase-merge\", or \"squash\". + * \"rebase-merge\", \"squash\", or \"fast-forward-only\". * * @return defaultMergeStyle */ @Schema( description = "set to a merge style to be used by this repository: \"merge\", \"rebase\"," - + " \"rebase-merge\", or \"squash\".") + + " \"rebase-merge\", \"squash\", or \"fast-forward-only\".") public String getDefaultMergeStyle() { return defaultMergeStyle; } @@ -740,7 +766,8 @@ public class EditRepoOption implements Serializable { return false; } EditRepoOption editRepoOption = (EditRepoOption) o; - return Objects.equals(this.allowManualMerge, editRepoOption.allowManualMerge) + return Objects.equals(this.allowFastForwardOnlyMerge, editRepoOption.allowFastForwardOnlyMerge) + && Objects.equals(this.allowManualMerge, editRepoOption.allowManualMerge) && Objects.equals(this.allowMergeCommits, editRepoOption.allowMergeCommits) && Objects.equals(this.allowRebase, editRepoOption.allowRebase) && Objects.equals(this.allowRebaseExplicit, editRepoOption.allowRebaseExplicit) @@ -777,6 +804,7 @@ public class EditRepoOption implements Serializable { @Override public int hashCode() { return Objects.hash( + allowFastForwardOnlyMerge, allowManualMerge, allowMergeCommits, allowRebase, @@ -814,6 +842,9 @@ public class EditRepoOption implements Serializable { StringBuilder sb = new StringBuilder(); sb.append("class EditRepoOption {\n"); + sb.append(" allowFastForwardOnlyMerge: ") + .append(toIndentedString(allowFastForwardOnlyMerge)) + .append("\n"); sb.append(" allowManualMerge: ").append(toIndentedString(allowManualMerge)).append("\n"); sb.append(" allowMergeCommits: ").append(toIndentedString(allowMergeCommits)).append("\n"); sb.append(" allowRebase: ").append(toIndentedString(allowRebase)).append("\n"); diff --git a/src/main/java/org/gitnex/tea4j/v2/models/MergePullRequestOption.java b/src/main/java/org/gitnex/tea4j/v2/models/MergePullRequestOption.java index 6fcc1db..66b9351 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/MergePullRequestOption.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/MergePullRequestOption.java @@ -33,6 +33,7 @@ public class MergePullRequestOption implements Serializable { REBASE("rebase"), REBASE_MERGE("rebase-merge"), SQUASH("squash"), + FAST_FORWARD_ONLY("fast-forward-only"), MANUALLY_MERGED("manually-merged"); private String value; diff --git a/src/main/java/org/gitnex/tea4j/v2/models/Repository.java b/src/main/java/org/gitnex/tea4j/v2/models/Repository.java index 7dab89c..f14d32d 100644 --- a/src/main/java/org/gitnex/tea4j/v2/models/Repository.java +++ b/src/main/java/org/gitnex/tea4j/v2/models/Repository.java @@ -28,6 +28,9 @@ import java.util.Objects; public class Repository implements Serializable { private static final long serialVersionUID = 1L; + @SerializedName("allow_fast_forward_only_merge") + private Boolean allowFastForwardOnlyMerge = null; + @SerializedName("allow_merge_commits") private Boolean allowMergeCommits = null; @@ -247,6 +250,25 @@ public class Repository implements Serializable { @SerializedName("website") private String website = null; + public Repository allowFastForwardOnlyMerge(Boolean allowFastForwardOnlyMerge) { + this.allowFastForwardOnlyMerge = allowFastForwardOnlyMerge; + return this; + } + + /** + * Get allowFastForwardOnlyMerge + * + * @return allowFastForwardOnlyMerge + */ + @Schema(description = "") + public Boolean isAllowFastForwardOnlyMerge() { + return allowFastForwardOnlyMerge; + } + + public void setAllowFastForwardOnlyMerge(Boolean allowFastForwardOnlyMerge) { + this.allowFastForwardOnlyMerge = allowFastForwardOnlyMerge; + } + public Repository allowMergeCommits(Boolean allowMergeCommits) { this.allowMergeCommits = allowMergeCommits; return this; @@ -1358,7 +1380,8 @@ public class Repository implements Serializable { return false; } Repository repository = (Repository) o; - return Objects.equals(this.allowMergeCommits, repository.allowMergeCommits) + return Objects.equals(this.allowFastForwardOnlyMerge, repository.allowFastForwardOnlyMerge) + && Objects.equals(this.allowMergeCommits, repository.allowMergeCommits) && Objects.equals(this.allowRebase, repository.allowRebase) && Objects.equals(this.allowRebaseExplicit, repository.allowRebaseExplicit) && Objects.equals(this.allowRebaseUpdate, repository.allowRebaseUpdate) @@ -1422,6 +1445,7 @@ public class Repository implements Serializable { @Override public int hashCode() { return Objects.hash( + allowFastForwardOnlyMerge, allowMergeCommits, allowRebase, allowRebaseExplicit, @@ -1487,6 +1511,9 @@ public class Repository implements Serializable { StringBuilder sb = new StringBuilder(); sb.append("class Repository {\n"); + sb.append(" allowFastForwardOnlyMerge: ") + .append(toIndentedString(allowFastForwardOnlyMerge)) + .append("\n"); sb.append(" allowMergeCommits: ").append(toIndentedString(allowMergeCommits)).append("\n"); sb.append(" allowRebase: ").append(toIndentedString(allowRebase)).append("\n"); sb.append(" allowRebaseExplicit: ")