diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
| commit | 61180ab6f4b85ab78de2eaf1bc1b974c9e7908af (patch) | |
| tree | 0970691b2060e06b6feaf4e645021298a7efda0d /lib/pleroma/web/api_spec/helpers.ex | |
| parent | 0e23138b50f1fdd9ea78df31eec1b3caac905e2c (diff) | |
| parent | 4c044f62258b33a95b8281e1eb42a5e0ce47d42d (diff) | |
| download | pleroma-61180ab6f4b85ab78de2eaf1bc1b974c9e7908af.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
Diffstat (limited to 'lib/pleroma/web/api_spec/helpers.ex')
| -rw-r--r-- | lib/pleroma/web/api_spec/helpers.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/api_spec/helpers.ex b/lib/pleroma/web/api_spec/helpers.ex index a9cfe0fed..a258e8421 100644 --- a/lib/pleroma/web/api_spec/helpers.ex +++ b/lib/pleroma/web/api_spec/helpers.ex @@ -40,6 +40,12 @@ defmodule Pleroma.Web.ApiSpec.Helpers do "Return the newest items newer than this ID" ), Operation.parameter( + :offset, + :query, + %Schema{type: :integer, default: 0}, + "Return items past this number of items" + ), + Operation.parameter( :limit, :query, %Schema{type: :integer, default: 20}, |