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

Merge topic 'optional-change-count'

b7728827

 types: changes_count can also be null
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King's avatarBrad King <brad.king@kitware.com>
Merge-request: !115
parents 8e1ec2c5 b7728827
...@@ -291,7 +291,7 @@ fn test_read_merge_request() { ...@@ -291,7 +291,7 @@ fn test_read_merge_request() {
assert_eq!(merge_request.time_stats.total_time_spent, 0); assert_eq!(merge_request.time_stats.total_time_spent, 0);
assert_eq!(merge_request.time_stats.human_time_estimate, None); assert_eq!(merge_request.time_stats.human_time_estimate, None);
assert_eq!(merge_request.time_stats.human_total_time_spent, None); assert_eq!(merge_request.time_stats.human_total_time_spent, None);
assert_eq!(merge_request.changes_count, "3"); assert_eq!(merge_request.changes_count, Some("3".to_string()));
assert_eq!(merge_request.user_notes_count, 3); assert_eq!(merge_request.user_notes_count, 3);
assert_eq!(merge_request.discussion_locked, None); assert_eq!(merge_request.discussion_locked, None);
assert_eq!(merge_request.should_remove_source_branch, None); assert_eq!(merge_request.should_remove_source_branch, None);
......
...@@ -1386,7 +1386,7 @@ pub struct MergeRequest { ...@@ -1386,7 +1386,7 @@ pub struct MergeRequest {
/// ///
/// This is an integer suffixed by `+` if there are more files changed than some threshold /// This is an integer suffixed by `+` if there are more files changed than some threshold
/// (probably determined by a timeout). /// (probably determined by a timeout).
pub changes_count: String, pub changes_count: Option<String>,
/// The number of comments on the merge request. /// The number of comments on the merge request.
pub user_notes_count: u64, pub user_notes_count: u64,
/// Whether the discussion has been locked. /// Whether the discussion has been locked.
...@@ -1459,7 +1459,7 @@ pub struct MergeRequestChanges { ...@@ -1459,7 +1459,7 @@ pub struct MergeRequestChanges {
/// Time estimates. /// Time estimates.
pub time_stats: IssuableTimeStats, pub time_stats: IssuableTimeStats,
/// The number of paths changed by the merge request. /// The number of paths changed by the merge request.
pub changes_count: String, pub changes_count: Option<String>,
/// The number of comments on the merge request. /// The number of comments on the merge request.
pub user_notes_count: u64, pub user_notes_count: u64,
/// Whether the discussion has been locked. /// Whether the discussion has been locked.
......
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