diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-03-07 15:59:00 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-03-07 15:59:00 +0000 |
| commit | dbd7309a16bd3abc6c586b6c2df2beb317cfef95 (patch) | |
| tree | 3fdd719c926ac80285f0dc93ef975625657d0fbb /lib/api/helpers/pagination.rb | |
| parent | 7be248334b350091e83d0335bf0c263071c6a67f (diff) | |
| parent | b63efb09a5c864047924cd2d84527b47dd563d5f (diff) | |
| download | gitlab-ce-reply-to-comment-documentation.tar.gz | |
Merge branch 'master' into 'reply-to-comment-documentation'reply-to-comment-documentation
# Conflicts:
# doc/user/discussions/index.md
Diffstat (limited to 'lib/api/helpers/pagination.rb')
| -rw-r--r-- | lib/api/helpers/pagination.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers/pagination.rb b/lib/api/helpers/pagination.rb index d00e61678b5..94b58a64d26 100644 --- a/lib/api/helpers/pagination.rb +++ b/lib/api/helpers/pagination.rb @@ -149,7 +149,7 @@ module API def conditions(pagination) fields = pagination.fields - return nil if fields.empty? + return if fields.empty? placeholder = fields.map { '?' } |