Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions src/main/java/com/spotify/github/v3/repos/RepositoryBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,18 @@ public interface RepositoryBase extends UpdateTracking {
@Nullable
URI htmlUrl();

/** Allow squash merges */
@Nullable
Boolean allowSquashMerge();

/** Allow merge commits */
@Nullable
Boolean allowMergeCommit();

/** Allow rebase merges */
@Nullable
Boolean allowRebaseMerge();

/** Archive URL template */
@Nullable
String archiveUrl();
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/com/spotify/github/v3/repos/RepositoryTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,8 @@ public void testDeserialization() throws IOException {
assertThat(repository.fullName(), is(repository.owner().login() + "/Hello-World"));
assertThat(repository.isPrivate(), is(false));
assertThat(repository.isArchived(), is(false));
assertThat(repository.allowMergeCommit(), is(false));
assertThat(repository.allowRebaseMerge(), is(true));
assertThat(repository.allowSquashMerge(), is(true));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
"forks": 2,
"has_pages": false,
"has_downloads": true,
"allow_squash_merge": true,
"allow_merge_commit": false,
"allow_rebase_merge": true,
"pushed_at": "2011-01-26T19:06:43Z",
"created_at": "2011-01-26T19:01:12Z",
"updated_at": "2011-01-26T19:14:43Z",
Expand Down