fix conflict

Signed-off-by: Miles Zhang <[email protected]>
nervosnetwork · Dec 17, 2024 · 40f213f · 40f213f
2 parents fa1ea8c + 1e120e3
commit 40f213f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/lib/fast_jsonapi/pagination_meta_generator.rb b/app/lib/fast_jsonapi/pagination_meta_generator.rb
@@ -11,7 +11,7 @@ def initialize(request:, records:, page:, page_size:, total_pages: nil, records_
       @records_counter = records_counter || records
       @total_count = total_count || @records_counter.total_count.to_i
       @total_pages = total_pages || calculated_total_pages
-      @hash = { links: {}, meta: { total: @total_count, page_size: @page_size } }
+      @hash = { links: {}, meta: { total: @total_count, page_size: @page_size, total_pages: @total_pages } }
     end
 
     def calculated_total_pages