diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/event_collection.rb | 25 | ||||
| -rw-r--r-- | app/models/projects/import_export/relation_export.rb | 15 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 1 |
3 files changed, 17 insertions, 24 deletions
diff --git a/app/models/event_collection.rb b/app/models/event_collection.rb index 4258027aa56..72e1d28a297 100644 --- a/app/models/event_collection.rb +++ b/app/models/event_collection.rb @@ -62,21 +62,12 @@ class EventCollection end def in_operator_optimized_relation(parent_column, parents, parent_model) - query_builder_params = if Feature.enabled?(:optimized_project_and_group_activity_queries) - array_data = { - scope_ids: parents.pluck(:id), - scope_model: parent_model, - mapping_column: parent_column - } - filter.in_operator_query_builder_params(array_data) - else - { - scope: filtered_events, - array_scope: parents.select(:id), - array_mapping_scope: -> (parent_id_expression) { Event.where(Event.arel_table[parent_column].eq(parent_id_expression)).reorder(id: :desc) }, - finder_query: -> (id_expression) { Event.where(Event.arel_table[:id].eq(id_expression)) } - } - end + array_data = { + scope_ids: parents.pluck(:id), + scope_model: parent_model, + mapping_column: parent_column + } + query_builder_params = filter.in_operator_query_builder_params(array_data) Gitlab::Pagination::Keyset::InOperatorOptimization::QueryBuilder .new(**query_builder_params) @@ -84,10 +75,6 @@ class EventCollection .limit(@limit + @offset) end - def filtered_events - filter.apply_filter(base_relation) - end - def paginate_events(events) events.limit(@limit).offset(@offset) end diff --git a/app/models/projects/import_export/relation_export.rb b/app/models/projects/import_export/relation_export.rb index 15198049f87..9bdf10d7c0e 100644 --- a/app/models/projects/import_export/relation_export.rb +++ b/app/models/projects/import_export/relation_export.rb @@ -34,11 +34,18 @@ module Projects scope :by_relation, -> (relation) { where(relation: relation) } + STATUS = { + queued: 0, + started: 1, + finished: 2, + failed: 3 + }.freeze + state_machine :status, initial: :queued do - state :queued, value: 0 - state :started, value: 1 - state :finished, value: 2 - state :failed, value: 3 + state :queued, value: STATUS[:queued] + state :started, value: STATUS[:started] + state :finished, value: STATUS[:finished] + state :failed, value: STATUS[:failed] event :start do transition queued: :started diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 4bb1def1ade..d668399b408 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -21,7 +21,6 @@ = dispensable_render_if_exists "shared/new_user_signups_cap_reached_alert" = yield :page_level_alert = yield :free_user_cap_alert - = yield :usage_quotas_free_user_cap_alert = yield :group_invite_members_banner - unless @hide_breadcrumbs = render "layouts/nav/breadcrumbs" |