Merge topic 'position-hooks'

e6a05a7b

 webhooks: skip PositionHookAttrs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !68

src/webhooks.rs.in

@@ -471,7 +471,6 @@ pub struct DiffHookAttrs {
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
-#[serde(deny_unknown_fields)]
 // FIXME: This can apparently be a string sometimes.
 // https://gitlab.com/gitlab-org/gitlab-ce/issues/21467
 pub struct PositionHookAttrs {
@@ -495,8 +494,8 @@ pub struct NoteHookAttrs {
     pub note: String,
     /// The type of entity the note is attached to.
     pub noteable_type: NoteType,
-    pub original_position: Option<PositionHookAttrs>,
-    pub position: Option<PositionHookAttrs>,
+    // pub original_position: Option<PositionHookAttrs>,
+    // pub position: Option<PositionHookAttrs>,
     /// The author of the note.
     pub author_id: UserId,
     /// When the note was created.