Commit 936709be authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'gitlab-9.2-update'

861eb484 types: update for 9.2 changes
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !91
parents b67a5f29 861eb484
Pipeline #59903 passed with stage
in 0 seconds
......@@ -108,7 +108,7 @@ fn test_read_issue() {
assert_eq!(issue.iid, 6);
assert_eq!(issue.project_id, ProjectId::new(855));
assert_eq!(issue.title, "fix documentation warnings");
assert_eq!(issue.description, "");
assert_eq!(issue.description, Some("".to_string()));
assert_eq!(issue.state, IssueState::Closed);
assert_eq!(issue.created_at,
UTC.ymd(2016, 10, 30)
......@@ -157,8 +157,8 @@ fn test_read_issue_reference() {
assert_eq!(issue.project_id, ProjectId::new(855));
assert_eq!(issue.title, "Add project hook APIs");
assert_eq!(issue.description,
"The workflow currently requires that the robot be able to register itself as \
a webhook for new projects. An API needs added for this.\n\nCc: @brad.king");
Some("The workflow currently requires that the robot be able to register itself as \
a webhook for new projects. An API needs added for this.\n\nCc: @brad.king".to_string()));
assert_eq!(issue.state, IssueState::Closed);
assert_eq!(issue.created_at,
UTC.ymd(2016, 10, 4)
......@@ -477,7 +477,6 @@ fn test_read_user() {
assert_eq!(user.created_at,
UTC.ymd(2015, 2, 26)
.and_hms_milli(15, 58, 34, 670));
assert_eq!(user.is_admin, true);
assert_eq!(user.bio, Some("".to_string()));
assert_eq!(user.location, None);
assert_eq!(user.skype, "");
......@@ -502,7 +501,6 @@ fn test_read_user_public() {
assert_eq!(user_public.created_at,
UTC.ymd(2015, 2, 26)
.and_hms_milli(17, 23, 28, 730));
assert_eq!(user_public.is_admin, false);
assert_eq!(user_public.bio, None);
assert_eq!(user_public.location, None);
assert_eq!(user_public.skype, "");
......
......@@ -95,8 +95,6 @@ pub struct User {
pub web_url: String,
/// When the account was created.
pub created_at: DateTime<UTC>,
/// Whether the user is an administrator or not.
pub is_admin: bool,
/// Self-described biography of the user.
pub bio: Option<String>,
/// Geographic location of the user.
......@@ -167,8 +165,6 @@ pub struct UserPublic {
pub web_url: String,
/// When the account was created.
pub created_at: DateTime<UTC>,
/// Whether the user is an administrator or not.
pub is_admin: bool,
/// Self-described biography of the user.
pub bio: Option<String>,
/// Geographic location of the user.
......@@ -237,7 +233,6 @@ impl From<UserPublic> for User {
avatar_url: user.avatar_url,
web_url: user.web_url,
created_at: user.created_at,
is_admin: user.is_admin,
bio: user.bio,
location: user.location,
skype: user.skype,
......@@ -1095,7 +1090,7 @@ pub struct Issue {
/// The title of the issue.
pub title: String,
/// The description of the issue.
pub description: String,
pub description: Option<String>,
/// The state of the issue.
pub state: IssueState,
/// When the issue was created.
......
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