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

Merge topic 'gitlab-8.17-update'

a22e65d6 types: milestone start dates do not have a time
24a72aa0

 gitlab: update for 8.17
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King's avatarBrad King <brad.king@kitware.com>
Merge-request: !79
parents 7a72406c a22e65d6
...@@ -743,6 +743,8 @@ pub struct Group { ...@@ -743,6 +743,8 @@ pub struct Group {
pub web_url: String, pub web_url: String,
/// Whether membership requests are allowed for the group. /// Whether membership requests are allowed for the group.
pub request_access_enabled: bool, pub request_access_enabled: bool,
pub full_name: String,
pub full_path: String,
/// Statistics about the group. /// Statistics about the group.
pub statistics: Option<ProjectStatistics>, pub statistics: Option<ProjectStatistics>,
} }
...@@ -787,6 +789,8 @@ pub struct GroupDetail { ...@@ -787,6 +789,8 @@ pub struct GroupDetail {
pub shared_projects: Vec<Project>, pub shared_projects: Vec<Project>,
/// Whether membership requests are allowed for the group. /// Whether membership requests are allowed for the group.
pub request_access_enabled: bool, pub request_access_enabled: bool,
pub full_name: String,
pub full_path: String,
/// Statistics about the group. /// Statistics about the group.
pub statistics: Option<ProjectStatistics>, pub statistics: Option<ProjectStatistics>,
} }
...@@ -803,6 +807,8 @@ impl From<GroupDetail> for Group { ...@@ -803,6 +807,8 @@ impl From<GroupDetail> for Group {
avatar_url: detail.avatar_url, avatar_url: detail.avatar_url,
web_url: detail.web_url, web_url: detail.web_url,
request_access_enabled: detail.request_access_enabled, request_access_enabled: detail.request_access_enabled,
full_name: detail.full_name,
full_path: detail.full_path,
statistics: detail.statistics, statistics: detail.statistics,
} }
} }
...@@ -1080,7 +1086,7 @@ pub struct Milestone { ...@@ -1080,7 +1086,7 @@ pub struct Milestone {
/// When the milestone is due. /// When the milestone is due.
pub due_date: Option<NaiveDate>, pub due_date: Option<NaiveDate>,
/// When the milestone was started. /// When the milestone was started.
pub start_date: Option<DateTime<UTC>>, pub start_date: Option<NaiveDate>,
} }
#[cfg_attr(feature="strict", serde(deny_unknown_fields))] #[cfg_attr(feature="strict", serde(deny_unknown_fields))]
...@@ -1972,6 +1978,7 @@ impl Namespace { ...@@ -1972,6 +1978,7 @@ impl Namespace {
// expose :koding_url // expose :koding_url
// expose :plantuml_enabled // expose :plantuml_enabled
// expose :plantuml_url // expose :plantuml_url
// expose :terminal_max_session_time
//end //end
//class Release < Grape::Entity //class Release < Grape::Entity
......
Supports Markdown
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