summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2017-01-23 18:55:56 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2017-01-23 18:55:56 +0100
commitbd481e10aade489535f90d6360cc9dd4e97bfb5b (patch)
treed6c8843fbd3237aaf5b0224fe585f31a1a389249
parent30d5e9fa54e0beacfb9b28c307543ff359f17668 (diff)
downloadgitlab-ce-api-remove-upvote-ownvote.tar.gz
API: Remove deprecated upvote and downvote field from notes APIapi-remove-upvote-ownvote
-rw-r--r--changelogs/unreleased/api-remove-upvote-ownvote.yml4
-rw-r--r--doc/api/notes.md18
-rw-r--r--doc/api/projects.md2
-rw-r--r--doc/api/users.md2
-rw-r--r--lib/api/entities.rb3
5 files changed, 7 insertions, 22 deletions
diff --git a/changelogs/unreleased/api-remove-upvote-ownvote.yml b/changelogs/unreleased/api-remove-upvote-ownvote.yml
new file mode 100644
index 00000000000..cbac84bf48d
--- /dev/null
+++ b/changelogs/unreleased/api-remove-upvote-ownvote.yml
@@ -0,0 +1,4 @@
+---
+title: 'API: Remove deprecated upvote and downvote field from notes API'
+merge_request: 8724
+author: Robert Schilling
diff --git a/doc/api/notes.md b/doc/api/notes.md
index 214dfa4068d..dced821cc6d 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -34,8 +34,6 @@ Parameters:
"created_at": "2013-10-02T09:22:45Z",
"updated_at": "2013-10-02T10:22:45Z",
"system": true,
- "upvote": false,
- "downvote": false,
"noteable_id": 377,
"noteable_type": "Issue"
},
@@ -54,8 +52,6 @@ Parameters:
"created_at": "2013-10-02T09:56:03Z",
"updated_at": "2013-10-02T09:56:03Z",
"system": true,
- "upvote": false,
- "downvote": false,
"noteable_id": 121,
"noteable_type": "Issue"
}
@@ -147,9 +143,7 @@ Example Response:
"created_at": "2016-04-05T22:10:44.164Z",
"system": false,
"noteable_id": 11,
- "noteable_type": "Issue",
- "upvote": false,
- "downvote": false
+ "noteable_type": "Issue"
}
```
@@ -271,9 +265,7 @@ Example Response:
"created_at": "2016-04-06T16:51:53.239Z",
"system": false,
"noteable_id": 52,
- "noteable_type": "Snippet",
- "upvote": false,
- "downvote": false
+ "noteable_type": "Snippet"
}
```
@@ -322,8 +314,6 @@ Parameters:
"created_at": "2013-10-02T08:57:14Z",
"updated_at": "2013-10-02T08:57:14Z",
"system": false,
- "upvote": false,
- "downvote": false,
"noteable_id": 2,
"noteable_type": "MergeRequest"
}
@@ -400,8 +390,6 @@ Example Response:
"created_at": "2016-04-05T22:11:59.923Z",
"system": false,
"noteable_id": 7,
- "noteable_type": "MergeRequest",
- "upvote": false,
- "downvote": false
+ "noteable_type": "MergeRequest"
}
```
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 122075bbd11..e0c2ccd530d 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -601,8 +601,6 @@ Parameters:
},
"created_at": "2015-12-04T10:33:56.698Z",
"system": false,
- "upvote": false,
- "downvote": false,
"noteable_id": 377,
"noteable_type": "Issue"
},
diff --git a/doc/api/users.md b/doc/api/users.md
index 28b6c7bd491..a6fd343804a 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -815,8 +815,6 @@ Example response:
},
"created_at": "2015-12-04T10:33:56.698Z",
"system": false,
- "upvote": false,
- "downvote": false,
"noteable_id": 377,
"noteable_type": "Issue"
},
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 9f59939e9ae..ff8abefddf3 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -339,9 +339,6 @@ module API
expose :created_at, :updated_at
expose :system?, as: :system
expose :noteable_id, :noteable_type
- # upvote? and downvote? are deprecated, always return false
- expose(:upvote?) { |note| false }
- expose(:downvote?) { |note| false }
end
class AwardEmoji < Grape::Entity