Skip to content

Commit 5c2953c

Browse files
authored
Add merge strategy fields to Repository model (#92)
Adds: - allowMergeCommit - allowRebaseMerge - allowSquashMerge
1 parent 8181445 commit 5c2953c

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

src/main/java/com/spotify/github/v3/repos/RepositoryBase.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,18 @@ public interface RepositoryBase extends UpdateTracking {
7979
@Nullable
8080
URI htmlUrl();
8181

82+
/** Allow squash merges */
83+
@Nullable
84+
Boolean allowSquashMerge();
85+
86+
/** Allow merge commits */
87+
@Nullable
88+
Boolean allowMergeCommit();
89+
90+
/** Allow rebase merges */
91+
@Nullable
92+
Boolean allowRebaseMerge();
93+
8294
/** Archive URL template */
8395
@Nullable
8496
String archiveUrl();

src/test/java/com/spotify/github/v3/repos/RepositoryTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,8 @@ public void testDeserialization() throws IOException {
5050
assertThat(repository.fullName(), is(repository.owner().login() + "/Hello-World"));
5151
assertThat(repository.isPrivate(), is(false));
5252
assertThat(repository.isArchived(), is(false));
53+
assertThat(repository.allowMergeCommit(), is(false));
54+
assertThat(repository.allowRebaseMerge(), is(true));
55+
assertThat(repository.allowSquashMerge(), is(true));
5356
}
5457
}

src/test/resources/com/spotify/github/v3/repos/repository.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
"forks": 2,
8282
"has_pages": false,
8383
"has_downloads": true,
84+
"allow_squash_merge": true,
85+
"allow_merge_commit": false,
86+
"allow_rebase_merge": true,
8487
"pushed_at": "2011-01-26T19:06:43Z",
8588
"created_at": "2011-01-26T19:01:12Z",
8689
"updated_at": "2011-01-26T19:14:43Z",

0 commit comments

Comments
 (0)