diff options
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 5ceedbc1e01..b7b6e6534fb 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -311,8 +311,6 @@ class ProjectsController < Projects::ApplicationController find_tags = true find_commits = true - use_gitaly_pagination = Feature.enabled?(:use_gitaly_pagination_for_refs, @project) - unless find_refs.nil? find_branches = find_refs.include?('branches') find_tags = find_refs.include?('tags') @@ -323,7 +321,7 @@ class ProjectsController < Projects::ApplicationController if find_branches branches = BranchesFinder.new(@repository, refs_params.merge(per_page: REFS_LIMIT)) - .execute(gitaly_pagination: use_gitaly_pagination) + .execute(gitaly_pagination: true) .take(REFS_LIMIT) .map(&:name) @@ -332,7 +330,7 @@ class ProjectsController < Projects::ApplicationController if find_tags && @repository.tag_count.nonzero? tags = TagsFinder.new(@repository, refs_params.merge(per_page: REFS_LIMIT)) - .execute(gitaly_pagination: use_gitaly_pagination) + .execute(gitaly_pagination: true) .take(REFS_LIMIT) .map(&:name) @@ -435,14 +433,14 @@ class ProjectsController < Projects::ApplicationController analytics_access_level security_and_compliance_access_level container_registry_access_level + releases_access_level ] + operations_feature_attributes end def operations_feature_attributes if Feature.enabled?(:split_operations_visibility_permissions, project) %i[ - environments_access_level feature_flags_access_level releases_access_level - monitor_access_level + environments_access_level feature_flags_access_level monitor_access_level ] else %i[operations_access_level] |