Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d65d1ae1
Commit
d65d1ae1
authored
Sep 25, 2020
by
Andreas Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update feature flag definition
parent
3fd9cc8a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
config/feature_flags/ops/api_kaminari_count_with_limit.yml
config/feature_flags/ops/api_kaminari_count_with_limit.yml
+7
-0
lib/gitlab/pagination/offset_pagination.rb
lib/gitlab/pagination/offset_pagination.rb
+1
-1
No files found.
config/feature_flags/
development
/api_kaminari_count_with_limit.yml
→
config/feature_flags/
ops
/api_kaminari_count_with_limit.yml
View file @
d65d1ae1
---
---
name
:
api_kaminari_count_with_limit
name
:
api_kaminari_count_with_limit
introduced_by_url
:
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23931
rollout_issue_url
:
rollout_issue_url
:
group
:
group
:
group::ecosystem
type
:
development
type
:
ops
default_enabled
:
false
default_enabled
:
false
lib/gitlab/pagination/offset_pagination.rb
View file @
d65d1ae1
...
@@ -27,7 +27,7 @@ module Gitlab
...
@@ -27,7 +27,7 @@ module Gitlab
end
end
return
pagination_data
unless
pagination_data
.
is_a?
(
ActiveRecord
::
Relation
)
return
pagination_data
unless
pagination_data
.
is_a?
(
ActiveRecord
::
Relation
)
return
pagination_data
unless
Feature
.
enabled?
(
:api_kaminari_count_with_limit
)
return
pagination_data
unless
Feature
.
enabled?
(
:api_kaminari_count_with_limit
,
type: :ops
)
limited_total_count
=
pagination_data
.
total_count_with_limit
limited_total_count
=
pagination_data
.
total_count_with_limit
if
limited_total_count
>
Kaminari
::
ActiveRecordRelationMethods
::
MAX_COUNT_LIMIT
if
limited_total_count
>
Kaminari
::
ActiveRecordRelationMethods
::
MAX_COUNT_LIMIT
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment