diff --git a/VERSION b/VERSION index c262b1f0d..8819d012c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.21.6 +1.21.7 diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss index ed9fe5b69..648fac245 100644 --- a/app/assets/stylesheets/repositories.scss +++ b/app/assets/stylesheets/repositories.scss @@ -133,12 +133,12 @@ display: flex; flex-grow: 1; flex-wrap: nowrap; - height: 5em; + height: 6em; left: var(--repository-sidebar-margin); overflow: hidden; - padding: 0 2em; + padding: 1em 2em 0; position: fixed; - top: calc(5em + var(--navbar-height)); + top: calc(4em + var(--navbar-height)); transition: .4s $timing-function-sharp; width: calc(100% - var(--repository-sidebar-margin)); z-index: 90; diff --git a/app/controllers/api/v1/inventory_items_controller.rb b/app/controllers/api/v1/inventory_items_controller.rb index aecdff04e..0cb9b8c29 100644 --- a/app/controllers/api/v1/inventory_items_controller.rb +++ b/app/controllers/api/v1/inventory_items_controller.rb @@ -17,6 +17,7 @@ module Api .preload(repository_cells: @inventory.cell_preload_includes) .page(params.dig(:page, :number)) .per(params.dig(:page, :size)) + .order(:id) render jsonapi: items, each_serializer: InventoryItemSerializer, include: include_params end diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb index 2dd4e31b8..7ea7b2b42 100644 --- a/config/initializers/kaminari_config.rb +++ b/config/initializers/kaminari_config.rb @@ -2,7 +2,7 @@ Kaminari.configure do |config| config.default_per_page = 10 - # config.max_per_page = nil + config.max_per_page = 100 # config.window = 4 # config.outer_window = 0 # config.left = 0 diff --git a/yarn.lock b/yarn.lock index a12afcf1b..21b0bdc43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10331,9 +10331,9 @@ xtend@^4.0.0, xtend@~4.0.1: integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68= y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0"