From 14c624f4c10e9bdb1a9036b8cbf72ef986e31b71 Mon Sep 17 00:00:00 2001 From: IzzySmillie Date: Tue, 10 Jan 2023 10:54:56 +0000 Subject: [PATCH 01/18] Create draft PR for #99 From 34bc4b4ec289e0f5ab13646a1aaca914782f56d6 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Tue, 10 Jan 2023 11:15:47 +0000 Subject: [PATCH 02/18] Add kaminari gem --- Gemfile | 1 + Gemfile.lock | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index e51ba026e..ffde65df4 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ gem 'cancancan', '~> 3.3' gem 'faraday' gem 'importmap-rails' gem 'jbuilder' +gem 'kaminari' gem 'pg', '~> 1.1' gem 'puma', '~> 5.6' gem 'rack-cors' diff --git a/Gemfile.lock b/Gemfile.lock index 2736255f1..52dbac3bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,6 +126,18 @@ GEM activesupport (>= 5.0.0) jmespath (1.6.2) json (2.6.2) + kaminari (1.2.2) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) + actionview + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) + activerecord + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -147,6 +159,8 @@ GEM nio4r (2.5.8) nokogiri (1.13.9-aarch64-linux) racc (~> 1.4) + nokogiri (1.13.9-arm64-darwin) + racc (~> 1.4) nokogiri (1.13.9-x86_64-linux) racc (~> 1.4) parallel (1.22.1) @@ -270,6 +284,7 @@ GEM PLATFORMS aarch64-linux + arm64-darwin-21 x86_64-linux DEPENDENCIES @@ -282,6 +297,7 @@ DEPENDENCIES faraday importmap-rails jbuilder + kaminari pg (~> 1.1) pry-byebug puma (~> 5.6) @@ -302,4 +318,4 @@ RUBY VERSION ruby 3.1.3p185 BUNDLED WITH - 2.3.26 + 2.3.7 From 3ae3bc07b11b7edb6cbc0edb7c58fca289d88599 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Tue, 10 Jan 2023 11:30:09 +0000 Subject: [PATCH 03/18] Add pagination to projects index --- app/controllers/api/projects_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 9105a2f5c..f9c0074e3 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -9,7 +9,8 @@ class ProjectsController < ApiController skip_load_resource only: :create def index - render :index, formats: [:json] + paginated_projects = projects.page(params[:page]).per(8) + render index: paginated_projects, formats: [:json] end def show From d9f6bd88e11896ad94f1dd8e4d3f2d01ccffc33e Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Tue, 10 Jan 2023 14:55:06 +0000 Subject: [PATCH 04/18] Fix projects var --- app/controllers/api/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index f9c0074e3..18fbfd179 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -9,7 +9,7 @@ class ProjectsController < ApiController skip_load_resource only: :create def index - paginated_projects = projects.page(params[:page]).per(8) + paginated_projects = @projects.page(params[:page]).per(8) render index: paginated_projects, formats: [:json] end From ddd88dcb17a8561b9b24c8ba8cda831a24939be6 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Tue, 10 Jan 2023 16:29:44 +0000 Subject: [PATCH 05/18] wip: pagination working with json render --- app/controllers/api/projects_controller.rb | 2 +- spec/request/projects/index_spec.rb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 18fbfd179..cd89f4b81 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -10,7 +10,7 @@ class ProjectsController < ApiController def index paginated_projects = @projects.page(params[:page]).per(8) - render index: paginated_projects, formats: [:json] + render json: paginated_projects end def show diff --git a/spec/request/projects/index_spec.rb b/spec/request/projects/index_spec.rb index edbee5a35..a66a3976d 100644 --- a/spec/request/projects/index_spec.rb +++ b/spec/request/projects/index_spec.rb @@ -41,6 +41,25 @@ end end + context 'when user has multiple pages worth of projects' do + before do + create_list(:project, 10, user_id:) + mock_oauth_user(user_id) + end + + it 'returns 8 on the first page' do + get '/api/projects?page=1' + returned = JSON.parse(response.body) + expect(returned.length).to eq(8) + end + + it 'returns the next 8 projects on next page' do + get '/api/projects?page=2' + returned = JSON.parse(response.body) + expect(returned.length).to eq(4) + end + end + context 'when no user' do it 'returns unauthorized' do get '/api/projects' From 6d1968674fbe066b57a2e2cf820517c420ab5d0b Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Tue, 10 Jan 2023 16:36:35 +0000 Subject: [PATCH 06/18] Fix rendering of index for paginated_projects --- app/controllers/api/projects_controller.rb | 4 ++-- app/views/api/projects/index.json.jbuilder | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index cd89f4b81..358b178f0 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -9,8 +9,8 @@ class ProjectsController < ApiController skip_load_resource only: :create def index - paginated_projects = @projects.page(params[:page]).per(8) - render json: paginated_projects + @paginated_projects = @projects.page(params[:page]).per(8) + render index: @paginated_projects, formats: [:json] end def show diff --git a/app/views/api/projects/index.json.jbuilder b/app/views/api/projects/index.json.jbuilder index c3c4d9808..f29fe2640 100644 --- a/app/views/api/projects/index.json.jbuilder +++ b/app/views/api/projects/index.json.jbuilder @@ -1,3 +1,3 @@ # frozen_string_literal: true -json.array! @projects, :identifier, :project_type, :name, :user_id, :updated_at +json.array! @paginated_projects, :identifier, :project_type, :name, :user_id, :updated_at From 10bf3374a7a0fbd210b1f14071aef745412878b6 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Wed, 11 Jan 2023 11:56:59 +0000 Subject: [PATCH 07/18] wip setting up pagination link header --- app/controllers/api/projects_controller.rb | 20 ++++++++++++++++++++ spec/request/projects/index_spec.rb | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 358b178f0..6fd5e626d 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -5,6 +5,7 @@ class ProjectsController < ApiController before_action :require_oauth_user, only: %i[create update index destroy] before_action :load_project, only: %i[show update destroy] before_action :load_projects, only: %i[index] + after_action :set_pagination_link_header, only: [:index] load_and_authorize_resource skip_load_resource only: :create @@ -65,5 +66,24 @@ def project_params } ) end + + def set_pagination_link_header + params_page = request.query_parameters[:page].to_i + total_pages = @projects.page(1).per(8).total_pages + first_page = @projects.page(params_page).per(8).first_page? + last_page = @projects.page(params_page).per(9).last_page? + + page = {} + page[:current] = params_page + page[:total] = total_pages + page[:first] = 1 if page[:total] > 1 && !first_page + page[:last] = total_pages if total_pages > 1 && !last_page + page[:next] = params_page + 1 unless last_page + page[:prev] = params_page - 1 unless first_page + + pp(page) + + headers['Link'] = 'Link data' + end end end diff --git a/spec/request/projects/index_spec.rb b/spec/request/projects/index_spec.rb index a66a3976d..ba61bdc66 100644 --- a/spec/request/projects/index_spec.rb +++ b/spec/request/projects/index_spec.rb @@ -50,12 +50,16 @@ it 'returns 8 on the first page' do get '/api/projects?page=1' returned = JSON.parse(response.body) + pp('***') + pp(response.header) expect(returned.length).to eq(8) end it 'returns the next 8 projects on next page' do get '/api/projects?page=2' returned = JSON.parse(response.body) + pp('***') + pp(response.header) expect(returned.length).to eq(4) end end From fed886dbb2237cda6d19ab10057d09fc35a43942 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Wed, 11 Jan 2023 12:07:15 +0000 Subject: [PATCH 08/18] current and total not needed as links --- app/controllers/api/projects_controller.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 6fd5e626d..76778aa6a 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -74,8 +74,6 @@ def set_pagination_link_header last_page = @projects.page(params_page).per(9).last_page? page = {} - page[:current] = params_page - page[:total] = total_pages page[:first] = 1 if page[:total] > 1 && !first_page page[:last] = total_pages if total_pages > 1 && !last_page page[:next] = params_page + 1 unless last_page From b74e65aeacbc7d02b9ce41062a2d7227d1a6e973 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Wed, 11 Jan 2023 13:16:44 +0000 Subject: [PATCH 09/18] wip: refactoring pagination_header --- app/controllers/api/projects_controller.rb | 34 +++++++++++++++------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 76778aa6a..d1482e648 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -5,7 +5,7 @@ class ProjectsController < ApiController before_action :require_oauth_user, only: %i[create update index destroy] before_action :load_project, only: %i[show update destroy] before_action :load_projects, only: %i[index] - after_action :set_pagination_link_header, only: [:index] + after_action :pagination_link_header, only: [:index] load_and_authorize_resource skip_load_resource only: :create @@ -67,21 +67,35 @@ def project_params ) end - def set_pagination_link_header - params_page = request.query_parameters[:page].to_i + def pagination_link_header + params_page = params.key?(:page) ? params[:page].to_i : 1 total_pages = @projects.page(1).per(8).total_pages first_page = @projects.page(params_page).per(8).first_page? last_page = @projects.page(params_page).per(9).last_page? - page = {} - page[:first] = 1 if page[:total] > 1 && !first_page - page[:last] = total_pages if total_pages > 1 && !last_page - page[:next] = params_page + 1 unless last_page - page[:prev] = params_page - 1 unless first_page + pagination_links = [] + pagination_links << page_links(1, 'first') if total_pages > 1 && !first_page + pagination_links << page_links(total_pages, 'last') if total_pages > 1 && !last_page + pagination_links << page_links(params_page + 1, 'next') unless last_page + pagination_links << page_links(params_page - 1, 'prev') unless first_page - pp(page) + headers['Link'] = pagination_links.join('; ') + end - headers['Link'] = 'Link data' + def page_links(to_page, rel_type) + page_info = "page=#{to_page}" + "<#{request.base_url}/api/projects?#{page_info}>, rel=\"#{rel_type}\"" end + + # def pagination_links(page) + # pagination_links = [] + + # page.each do |k, v| + # page_query = request.query_parameters.merge({ page: v }) + # pagination_links << "<#{request.base_url}/api/projects?#{page_query.to_param}>, rel=\"#{k}\"" + # end + + # headers['Link'] = pagination_links.join('; ') + # end end end From f16a491b929bccc8f1aacc25401fb64cb1d9c296 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Wed, 11 Jan 2023 14:35:52 +0000 Subject: [PATCH 10/18] more refactoring --- app/controllers/api/projects_controller.rb | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index d1482e648..1f2c534bf 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -68,16 +68,11 @@ def project_params end def pagination_link_header - params_page = params.key?(:page) ? params[:page].to_i : 1 - total_pages = @projects.page(1).per(8).total_pages - first_page = @projects.page(params_page).per(8).first_page? - last_page = @projects.page(params_page).per(9).last_page? - pagination_links = [] pagination_links << page_links(1, 'first') if total_pages > 1 && !first_page pagination_links << page_links(total_pages, 'last') if total_pages > 1 && !last_page - pagination_links << page_links(params_page + 1, 'next') unless last_page - pagination_links << page_links(params_page - 1, 'prev') unless first_page + pagination_links << page_links(page + 1, 'next') unless last_page + pagination_links << page_links(page - 1, 'prev') unless first_page headers['Link'] = pagination_links.join('; ') end @@ -87,15 +82,20 @@ def page_links(to_page, rel_type) "<#{request.base_url}/api/projects?#{page_info}>, rel=\"#{rel_type}\"" end - # def pagination_links(page) - # pagination_links = [] + def page + params.key?(:page) ? params[:page].to_i : 1 + end + + def total_pages + @projects.page(1).per(8).total_pages + end - # page.each do |k, v| - # page_query = request.query_parameters.merge({ page: v }) - # pagination_links << "<#{request.base_url}/api/projects?#{page_query.to_param}>, rel=\"#{k}\"" - # end + def first_page + @projects.page(page).per(8).first_page? + end - # headers['Link'] = pagination_links.join('; ') - # end + def last_page + @projects.page(page).per(9).last_page? + end end end From 697fdc999cca05a1a444e3193a480ab089afbe49 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Wed, 11 Jan 2023 15:12:18 +0000 Subject: [PATCH 11/18] Update default_per_page --- app/controllers/api/projects_controller.rb | 12 ++++++------ config/initializers/kaminari_config.rb | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 config/initializers/kaminari_config.rb diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 04c0f58dc..ce422f2d4 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -10,7 +10,7 @@ class ProjectsController < ApiController skip_load_resource only: :create def index - @paginated_projects = @projects.page(params[:page]).per(8) + @paginated_projects = @projects.page(params[:page]) render index: @paginated_projects, formats: [:json] end @@ -75,12 +75,12 @@ def pagination_link_header pagination_links << page_links(page + 1, 'next') unless last_page pagination_links << page_links(page - 1, 'prev') unless first_page - headers['Link'] = pagination_links.join('; ') + headers['Link'] = pagination_links.join(', ') end def page_links(to_page, rel_type) page_info = "page=#{to_page}" - "<#{request.base_url}/api/projects?#{page_info}>, rel=\"#{rel_type}\"" + "<#{request.base_url}/api/projects?#{page_info}>; rel=\"#{rel_type}\"" end def page @@ -88,15 +88,15 @@ def page end def total_pages - @projects.page(1).per(8).total_pages + @projects.page(1).total_pages end def first_page - @projects.page(page).per(8).first_page? + @projects.page(page).first_page? end def last_page - @projects.page(page).per(9).last_page? + @projects.page(page).last_page? end end end diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb new file mode 100644 index 000000000..9942177d5 --- /dev/null +++ b/config/initializers/kaminari_config.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +Kaminari.configure do |config| + config.default_per_page = 8 +end From 3a6700fd2e8adf49a2e25941f4f35795c4d4f2c0 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Wed, 11 Jan 2023 15:26:51 +0000 Subject: [PATCH 12/18] More refactoring and splitting out --- app/controllers/api/projects_controller.rb | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index ce422f2d4..4c63975d2 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -70,15 +70,18 @@ def project_params def pagination_link_header pagination_links = [] - pagination_links << page_links(1, 'first') if total_pages > 1 && !first_page - pagination_links << page_links(total_pages, 'last') if total_pages > 1 && !last_page - pagination_links << page_links(page + 1, 'next') unless last_page - pagination_links << page_links(page - 1, 'prev') unless first_page + pagination_links << page_links(first_page, 'first') + pagination_links << page_links(last_page, 'last') + pagination_links << page_links(next_page, 'next') + pagination_links << page_links(prev_page, 'prev') + pagination_links.compact_blank! headers['Link'] = pagination_links.join(', ') end def page_links(to_page, rel_type) + return if to_page.nil? + page_info = "page=#{to_page}" "<#{request.base_url}/api/projects?#{page_info}>; rel=\"#{rel_type}\"" end @@ -92,11 +95,19 @@ def total_pages end def first_page - @projects.page(page).first_page? + @projects.page(page).first_page? ? nil : 1 end def last_page - @projects.page(page).last_page? + @projects.page(page).last_page? ? nil : total_pages + end + + def next_page + @projects.page(page).next_page + end + + def prev_page + @projects.page(page).prev_page end end end From d90f6bac7889d3d240356e13f81c23f6e5d10d01 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Wed, 11 Jan 2023 16:22:50 +0000 Subject: [PATCH 13/18] Add pagination response header tests --- spec/request/projects/index_spec.rb | 32 ++++++++++++++++++++------- spec/support/pagination_links_mock.rb | 8 +++++++ 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 spec/support/pagination_links_mock.rb diff --git a/spec/request/projects/index_spec.rb b/spec/request/projects/index_spec.rb index ba61bdc66..2b9c3789a 100644 --- a/spec/request/projects/index_spec.rb +++ b/spec/request/projects/index_spec.rb @@ -3,6 +3,8 @@ require 'rails_helper' RSpec.describe 'Project index requests', type: :request do + include PaginationLinksMock + let(:user_id) { 'e0675b6c-dc48-4cd6-8c04-0f7ac05af51a' } let(:project_keys) { %w[identifier project_type name user_id updated_at] } @@ -41,27 +43,41 @@ end end - context 'when user has multiple pages worth of projects' do + context 'when the projects index has pagination' do before do create_list(:project, 10, user_id:) mock_oauth_user(user_id) end - it 'returns 8 on the first page' do - get '/api/projects?page=1' + it 'returns the default number of projects on the first page' do + get '/api/projects' returned = JSON.parse(response.body) - pp('***') - pp(response.header) expect(returned.length).to eq(8) end - it 'returns the next 8 projects on next page' do + it 'returns the next set of projects on the next page' do get '/api/projects?page=2' returned = JSON.parse(response.body) - pp('***') - pp(response.header) expect(returned.length).to eq(4) end + + it 'has the correct response headers for the first page' do + last_link = page_links(2, 'last') + next_link = page_links(2, 'next') + expected_link_header = [last_link, next_link].join(', ') + + get '/api/projects' + expect(response.headers['Link']).to eq expected_link_header + end + + it 'has the correct response headers for the next page' do + first_link = page_links(1, 'first') + prev_link = page_links(1, 'prev') + expected_link_header = [first_link, prev_link].join(', ') + + get '/api/projects?page=2' + expect(response.headers['Link']).to eq expected_link_header + end end context 'when no user' do diff --git a/spec/support/pagination_links_mock.rb b/spec/support/pagination_links_mock.rb new file mode 100644 index 000000000..bb51ff856 --- /dev/null +++ b/spec/support/pagination_links_mock.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +module PaginationLinksMock + def page_links(to_page, rel_type) + page_info = "page=#{to_page}" + "; rel=\"#{rel_type}\"" + end +end From c483f11a8a6ce60526511ff515cf54da884e7494 Mon Sep 17 00:00:00 2001 From: Lois Wells Date: Tue, 17 Jan 2023 17:22:07 +0000 Subject: [PATCH 14/18] Small change to CORS --- config/initializers/cors.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index 10b8174ff..d16944308 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -5,6 +5,6 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do allow do origins origins_array - resource '*', headers: :any, methods: %i[get post patch put delete] + resource '*', headers: :any, methods: %i[get post patch put delete], expose: ['Link'] end end From 5d93112023ad01bce57b2e2d029e05ce34df01e1 Mon Sep 17 00:00:00 2001 From: Lois Wells Date: Thu, 19 Jan 2023 12:35:05 +0000 Subject: [PATCH 15/18] Order projects by updated_at before paginating --- app/controllers/api/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 4c63975d2..08f1758da 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -53,7 +53,7 @@ def load_project end def load_projects - @projects = Project.where(user_id: current_user) + @projects = Project.where(user_id: current_user).order(updated_at: :desc) end def project_params From 2d3d62a686c39944daa2227ca0cbdd2d435bfd98 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Thu, 26 Jan 2023 14:26:34 +0000 Subject: [PATCH 16/18] Gemlock --- Gemfile.lock | 194 +++++++++++++++++++++++++++------------------------ 1 file changed, 101 insertions(+), 93 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 52dbac3bd..952224f12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,67 +1,67 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + actioncable (7.0.4.2) + actionpack (= 7.0.4.2) + activesupport (= 7.0.4.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actionmailbox (7.0.4.2) + actionpack (= 7.0.4.2) + activejob (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4) - actionpack (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activesupport (= 7.0.4) + actionmailer (7.0.4.2) + actionpack (= 7.0.4.2) + actionview (= 7.0.4.2) + activejob (= 7.0.4.2) + activesupport (= 7.0.4.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4) - actionview (= 7.0.4) - activesupport (= 7.0.4) + actionpack (7.0.4.2) + actionview (= 7.0.4.2) + activesupport (= 7.0.4.2) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4) - actionpack (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + actiontext (7.0.4.2) + actionpack (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4) - activesupport (= 7.0.4) + actionview (7.0.4.2) + activesupport (= 7.0.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4) - activesupport (= 7.0.4) + activejob (7.0.4.2) + activesupport (= 7.0.4.2) globalid (>= 0.3.6) - activemodel (7.0.4) - activesupport (= 7.0.4) - activerecord (7.0.4) - activemodel (= 7.0.4) - activesupport (= 7.0.4) - activestorage (7.0.4) - actionpack (= 7.0.4) - activejob (= 7.0.4) - activerecord (= 7.0.4) - activesupport (= 7.0.4) + activemodel (7.0.4.2) + activesupport (= 7.0.4.2) + activerecord (7.0.4.2) + activemodel (= 7.0.4.2) + activesupport (= 7.0.4.2) + activestorage (7.0.4.2) + actionpack (= 7.0.4.2) + activejob (= 7.0.4.2) + activerecord (= 7.0.4.2) + activesupport (= 7.0.4.2) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -70,50 +70,51 @@ GEM public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.674.0) - aws-sdk-core (3.168.4) + aws-partitions (1.700.0) + aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.61.0) + aws-sdk-kms (1.62.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) + aws-sdk-s3 (1.118.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) - bootsnap (1.15.0) + bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) byebug (11.1.3) cancancan (3.4.0) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) crack (0.4.5) rexml crass (1.0.6) + date (3.3.3) diff-lcs (1.5.0) docile (1.4.0) dotenv (2.8.1) dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) - erubi (1.11.0) + erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (3.0.0) + faker (3.1.0) i18n (>= 1.8.11, < 2) - faraday (2.7.1) + faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) hashdiff (1.0.1) i18n (1.12.0) @@ -125,7 +126,7 @@ GEM actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) - json (2.6.2) + json (2.6.3) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -138,79 +139,83 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.0.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.3) + minitest (5.17.0) msgpack (1.6.0) - net-imap (0.3.1) + net-imap (0.3.4) + date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.1.3) + net-protocol (0.2.1) timeout net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.13.9-aarch64-linux) + nokogiri (1.14.0-aarch64-linux) racc (~> 1.4) - nokogiri (1.13.9-arm64-darwin) + nokogiri (1.14.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.9-x86_64-linux) + nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) parallel (1.22.1) - parser (3.1.3.0) + parser (3.2.0.0) ast (~> 2.4.1) pg (1.4.5) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - public_suffix (5.0.0) + public_suffix (5.0.1) puma (5.6.5) nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.4) + racc (1.6.2) + rack (2.2.6.2) rack-cors (1.1.1) rack (>= 2.0.0) rack-test (2.0.2) rack (>= 1.3) - rails (7.0.4) - actioncable (= 7.0.4) - actionmailbox (= 7.0.4) - actionmailer (= 7.0.4) - actionpack (= 7.0.4) - actiontext (= 7.0.4) - actionview (= 7.0.4) - activejob (= 7.0.4) - activemodel (= 7.0.4) - activerecord (= 7.0.4) - activestorage (= 7.0.4) - activesupport (= 7.0.4) + rails (7.0.4.2) + actioncable (= 7.0.4.2) + actionmailbox (= 7.0.4.2) + actionmailer (= 7.0.4.2) + actionpack (= 7.0.4.2) + actiontext (= 7.0.4.2) + actionview (= 7.0.4.2) + activejob (= 7.0.4.2) + activemodel (= 7.0.4.2) + activerecord (= 7.0.4.2) + activestorage (= 7.0.4.2) + activesupport (= 7.0.4.2) bundler (>= 1.15.0) - railties (= 7.0.4) + railties (= 7.0.4.2) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (7.0.4) - actionpack (= 7.0.4) - activesupport (= 7.0.4) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (7.0.4.2) + actionpack (= 7.0.4.2) + activesupport (= 7.0.4.2) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.6.1) + regexp_parser (2.6.2) rexml (3.2.5) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -218,10 +223,10 @@ GEM rspec-mocks (~> 3.12.0) rspec-core (3.12.0) rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (6.0.1) @@ -235,24 +240,27 @@ GEM rspec-support (3.12.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.39.0) + rubocop (1.44.1) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.23.0, < 2.0) + rubocop-ast (>= 1.24.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.23.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) - rubocop-rails (2.17.3) + rubocop-capybara (2.17.0) + rubocop (~> 1.41) + rubocop-rails (2.17.4) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.15.0) + rubocop-rspec (2.18.1) rubocop (~> 1.33) + rubocop-capybara (~> 2.17) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) sentry-rails (5.5.0) @@ -260,19 +268,19 @@ GEM sentry-ruby (~> 5.5.0) sentry-ruby (5.5.0) concurrent-ruby (~> 1.0, >= 1.0.2) - shoulda-matchers (5.2.0) + shoulda-matchers (5.3.0) activesupport (>= 5.2.0) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) thor (1.2.1) - timeout (0.3.0) + timeout (0.3.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (2.3.0) + unicode-display_width (2.4.2) webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) From c61a7f477bd9a230598ac1a9a9c2b83d26b79d27 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Thu, 26 Jan 2023 14:41:01 +0000 Subject: [PATCH 17/18] Gemfile from main --- Gemfile.lock | 210 +++++++++++++++++++++++---------------------------- 1 file changed, 93 insertions(+), 117 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 952224f12..740404e5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,67 +1,67 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4.2) - actionpack (= 7.0.4.2) - activesupport (= 7.0.4.2) + actioncable (7.0.4) + actionpack (= 7.0.4) + activesupport (= 7.0.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4.2) - actionpack (= 7.0.4.2) - activejob (= 7.0.4.2) - activerecord (= 7.0.4.2) - activestorage (= 7.0.4.2) - activesupport (= 7.0.4.2) + actionmailbox (7.0.4) + actionpack (= 7.0.4) + activejob (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4.2) - actionpack (= 7.0.4.2) - actionview (= 7.0.4.2) - activejob (= 7.0.4.2) - activesupport (= 7.0.4.2) + actionmailer (7.0.4) + actionpack (= 7.0.4) + actionview (= 7.0.4) + activejob (= 7.0.4) + activesupport (= 7.0.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.2) - actionview (= 7.0.4.2) - activesupport (= 7.0.4.2) + actionpack (7.0.4) + actionview (= 7.0.4) + activesupport (= 7.0.4) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4.2) - actionpack (= 7.0.4.2) - activerecord (= 7.0.4.2) - activestorage (= 7.0.4.2) - activesupport (= 7.0.4.2) + actiontext (7.0.4) + actionpack (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4.2) - activesupport (= 7.0.4.2) + actionview (7.0.4) + activesupport (= 7.0.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.4.2) - activesupport (= 7.0.4.2) + activejob (7.0.4) + activesupport (= 7.0.4) globalid (>= 0.3.6) - activemodel (7.0.4.2) - activesupport (= 7.0.4.2) - activerecord (7.0.4.2) - activemodel (= 7.0.4.2) - activesupport (= 7.0.4.2) - activestorage (7.0.4.2) - actionpack (= 7.0.4.2) - activejob (= 7.0.4.2) - activerecord (= 7.0.4.2) - activesupport (= 7.0.4.2) + activemodel (7.0.4) + activesupport (= 7.0.4) + activerecord (7.0.4) + activemodel (= 7.0.4) + activesupport (= 7.0.4) + activestorage (7.0.4) + actionpack (= 7.0.4) + activejob (= 7.0.4) + activerecord (= 7.0.4) + activesupport (= 7.0.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4.2) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -70,51 +70,50 @@ GEM public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.700.0) - aws-sdk-core (3.170.0) + aws-partitions (1.674.0) + aws-sdk-core (3.168.4) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.62.0) + aws-sdk-kms (1.61.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.118.0) + aws-sdk-s3 (1.117.2) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) - bootsnap (1.16.0) + bootsnap (1.15.0) msgpack (~> 1.2) builder (3.2.4) byebug (11.1.3) cancancan (3.4.0) coderay (1.1.3) - concurrent-ruby (1.2.0) + concurrent-ruby (1.1.10) crack (0.4.5) rexml crass (1.0.6) - date (3.3.3) diff-lcs (1.5.0) docile (1.4.0) dotenv (2.8.1) dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) - erubi (1.12.0) + erubi (1.11.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (3.1.0) + faker (3.0.0) i18n (>= 1.8.11, < 2) - faraday (2.7.4) + faraday (2.7.1) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - globalid (1.1.0) + globalid (1.0.0) activesupport (>= 5.0) hashdiff (1.0.1) i18n (1.12.0) @@ -126,96 +125,78 @@ GEM actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) - json (2.6.3) - kaminari (1.2.2) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.2) - kaminari-activerecord (= 1.2.2) - kaminari-core (= 1.2.2) - kaminari-actionview (1.2.2) - actionview - kaminari-core (= 1.2.2) - kaminari-activerecord (1.2.2) - activerecord - kaminari-core (= 1.2.2) - kaminari-core (1.2.2) - loofah (2.19.1) + json (2.6.2) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.8.0.1) + mail (2.7.1) mini_mime (>= 0.1.1) - net-imap - net-pop - net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.17.0) + minitest (5.16.3) msgpack (1.6.0) - net-imap (0.3.4) - date + net-imap (0.3.1) net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.1.3) timeout net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.14.0-aarch64-linux) - racc (~> 1.4) - nokogiri (1.14.0-arm64-darwin) + nokogiri (1.13.10-aarch64-linux) racc (~> 1.4) - nokogiri (1.14.0-x86_64-linux) + nokogiri (1.13.10-x86_64-linux) racc (~> 1.4) parallel (1.22.1) - parser (3.2.0.0) + parser (3.1.3.0) ast (~> 2.4.1) pg (1.4.5) - pry (0.14.2) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - public_suffix (5.0.1) + public_suffix (5.0.0) puma (5.6.5) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.6.2) + racc (1.6.1) + rack (2.2.4) rack-cors (1.1.1) rack (>= 2.0.0) rack-test (2.0.2) rack (>= 1.3) - rails (7.0.4.2) - actioncable (= 7.0.4.2) - actionmailbox (= 7.0.4.2) - actionmailer (= 7.0.4.2) - actionpack (= 7.0.4.2) - actiontext (= 7.0.4.2) - actionview (= 7.0.4.2) - activejob (= 7.0.4.2) - activemodel (= 7.0.4.2) - activerecord (= 7.0.4.2) - activestorage (= 7.0.4.2) - activesupport (= 7.0.4.2) + rails (7.0.4) + actioncable (= 7.0.4) + actionmailbox (= 7.0.4) + actionmailer (= 7.0.4) + actionpack (= 7.0.4) + actiontext (= 7.0.4) + actionview (= 7.0.4) + activejob (= 7.0.4) + activemodel (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) bundler (>= 1.15.0) - railties (= 7.0.4.2) + railties (= 7.0.4) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - railties (7.0.4.2) - actionpack (= 7.0.4.2) - activesupport (= 7.0.4.2) + rails-html-sanitizer (1.4.3) + loofah (~> 2.3) + railties (7.0.4) + actionpack (= 7.0.4) + activesupport (= 7.0.4) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.6.2) + regexp_parser (2.6.1) rexml (3.2.5) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -223,10 +204,10 @@ GEM rspec-mocks (~> 3.12.0) rspec-core (3.12.0) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.3) + rspec-mocks (3.12.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (6.0.1) @@ -240,27 +221,24 @@ GEM rspec-support (3.12.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.44.1) + rubocop (1.39.0) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.23.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.23.0) parser (>= 3.1.1.0) - rubocop-capybara (2.17.0) - rubocop (~> 1.41) - rubocop-rails (2.17.4) + rubocop-rails (2.17.3) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.18.1) + rubocop-rspec (2.15.0) rubocop (~> 1.33) - rubocop-capybara (~> 2.17) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) sentry-rails (5.5.0) @@ -268,19 +246,19 @@ GEM sentry-ruby (~> 5.5.0) sentry-ruby (5.5.0) concurrent-ruby (~> 1.0, >= 1.0.2) - shoulda-matchers (5.3.0) + shoulda-matchers (5.2.0) activesupport (>= 5.2.0) - simplecov (0.22.0) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) thor (1.2.1) - timeout (0.3.1) + timeout (0.3.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (2.4.2) + unicode-display_width (2.3.0) webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) @@ -292,7 +270,6 @@ GEM PLATFORMS aarch64-linux - arm64-darwin-21 x86_64-linux DEPENDENCIES @@ -305,7 +282,6 @@ DEPENDENCIES faraday importmap-rails jbuilder - kaminari pg (~> 1.1) pry-byebug puma (~> 5.6) @@ -326,4 +302,4 @@ RUBY VERSION ruby 3.1.3p185 BUNDLED WITH - 2.3.7 + 2.3.26 From b5bac2e4d8fffe5a6931a3407110ab79c0bde698 Mon Sep 17 00:00:00 2001 From: Izzy Smillie Date: Thu, 26 Jan 2023 14:46:38 +0000 Subject: [PATCH 18/18] Gemlock fix --- Gemfile.lock | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 740404e5c..76d552a31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,6 +126,18 @@ GEM activesupport (>= 5.0.0) jmespath (1.6.2) json (2.6.2) + kaminari (1.2.2) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) + actionview + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) + activerecord + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -282,6 +294,7 @@ DEPENDENCIES faraday importmap-rails jbuilder + kaminari pg (~> 1.1) pry-byebug puma (~> 5.6)