Commit fd4b9ff6 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'gitlab-11.1'

a12c7898

 types: Update for 11.1
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !126
parents e59db4b1 a12c7898
{"name": "master", "developers_can_merge": false, "protected": true, "developers_can_push": false, "commit": {"committer_email": "kwrobot@kitware.com", "short_id": "a84836ab", "title": "Merge topic 'gitlab-9.3'", "author_email": "ben.boeckel@kitware.com", "committer_name": "Kitware Robot", "created_at": "2017-07-10T14:39:06.000-04:00", "author_name": "Ben Boeckel", "parent_ids": ["45aadb02640f6672fb4a382fc5b1ab5efec4f1df", "e5a23653f3d6532fefad0dffd90fb101ef94d42f"], "committed_date": "2017-07-10T14:39:06.000-04:00", "message": "Merge topic 'gitlab-9.3'\n\ne5a23653 systemhooks: update for 9.3 changes\n\nAcked-by: Kitware Robot <kwrobot@kitware.com>\nReviewed-by: Ben Boeckel <ben.boeckel@kitware.com>\nMerge-request: !100\n", "authored_date": "2017-07-10T18:39:04.000+00:00", "id": "a84836ab97dc687ca5a241205aff6a713255f767"}, "merged": false}
{"name": "master", "developers_can_merge": false, "protected": true, "developers_can_push": false, "can_push": true, "commit": {"committer_email": "brad.king@kitware.com", "short_id": "e59db4b1", "title": "cargo: prep for 0.1100.1", "author_email": "brad.king@kitware.com", "committer_name": "Brad King", "created_at": "2018-07-12T08:50:24.000-04:00", "author_name": "Brad King", "parent_ids": ["5c81cc05661dcbb5fd923cca093920816c21ef7e"], "committed_date": "2018-07-12T08:50:24.000-04:00", "message": "cargo: prep for 0.1100.1\n", "authored_date": "2018-07-12T08:50:24.000-04:00", "id": "e59db4b129b29df220ecec6119ed2130207a0397"}, "merged": false}
......@@ -453,35 +453,26 @@ fn test_read_repo_branch() {
assert_eq!(repo_branch.name, "master");
if let Some(ref commit) = repo_branch.commit {
assert_eq!(commit.author_email, "ben.boeckel@kitware.com");
assert_eq!(commit.author_name, "Ben Boeckel");
assert_eq!(commit.author_email, "brad.king@kitware.com");
assert_eq!(commit.author_name, "Brad King");
assert_eq!(commit.authored_date,
Utc.ymd(2017, 7, 10)
.and_hms_milli(18, 39, 4, 0));
Utc.ymd(2018, 7, 12)
.and_hms_milli(12, 50, 24, 0));
assert_eq!(commit.committed_date,
Utc.ymd(2017, 7, 10)
.and_hms_milli(18, 39, 6, 0));
Utc.ymd(2018, 7, 12)
.and_hms_milli(12, 50, 24, 0));
assert_eq!(commit.created_at,
Utc.ymd(2017, 7, 10)
.and_hms_milli(18, 39, 6, 0));
assert_eq!(commit.committer_email, "kwrobot@kitware.com");
assert_eq!(commit.committer_name, "Kitware Robot");
Utc.ymd(2018, 7, 12)
.and_hms_milli(12, 50, 24, 0));
assert_eq!(commit.committer_email, "brad.king@kitware.com");
assert_eq!(commit.committer_name, "Brad King");
assert_eq!(commit.id,
ObjectId::new("a84836ab97dc687ca5a241205aff6a713255f767"));
assert_eq!(commit.short_id, ObjectId::new("a84836ab"));
assert_eq!(commit.title, "Merge topic 'gitlab-9.3'");
assert_eq!(commit.message,
"Merge topic 'gitlab-9.3'\n\
\n\
e5a23653 systemhooks: update for 9.3 changes\n\
\n\
Acked-by: Kitware Robot <kwrobot@kitware.com>\n\
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>\n\
Merge-request: !100\n\
");
ObjectId::new("e59db4b129b29df220ecec6119ed2130207a0397"));
assert_eq!(commit.short_id, ObjectId::new("e59db4b1"));
assert_eq!(commit.title, "cargo: prep for 0.1100.1");
assert_eq!(commit.message, "cargo: prep for 0.1100.1\n");
assert_eq!(commit.parent_ids,
vec![ObjectId::new("45aadb02640f6672fb4a382fc5b1ab5efec4f1df"),
ObjectId::new("e5a23653f3d6532fefad0dffd90fb101ef94d42f")]);
vec![ObjectId::new("5c81cc05661dcbb5fd923cca093920816c21ef7e")]);
} else {
panic!("expected to have a commit for the branch");
}
......@@ -489,6 +480,7 @@ fn test_read_repo_branch() {
assert_eq!(repo_branch.protected, Some(true));
assert_eq!(repo_branch.developers_can_push, Some(false));
assert_eq!(repo_branch.developers_can_merge, Some(false));
assert_eq!(repo_branch.can_push, Some(true));
}
#[test]
......
......@@ -877,6 +877,8 @@ pub struct RepoBranch {
pub developers_can_push: Option<bool>,
/// Whether the developers can merge into the branch or not.
pub developers_can_merge: Option<bool>,
/// Whether the current user can push to the branch.
pub can_push: Option<bool>,
}
#[cfg_attr(feature="strict", serde(deny_unknown_fields))]
......
Markdown is supported
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