From f28375973b6f19182f895af12c243cf3166668f8 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:23:59 +0100 Subject: [PATCH 01/10] Bump ruby version to 3.3.5 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 338a5b5..fa7adc7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.6 +3.3.5 From 1bb0aa033aca09dbd37b8ffa8b54a9dd75c77856 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:25:01 +0100 Subject: [PATCH 02/10] Updated rails to latest version --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e61a083..d24c0ec 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,7 @@ source 'https://rubygems.org' -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.2.4' +gem 'rails' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets From 65915e966adff94f86cc729493db86d1457a8e50 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:25:23 +0100 Subject: [PATCH 03/10] Removed version specifications from Gemfile --- Gemfile | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index d24c0ec..610c177 100644 --- a/Gemfile +++ b/Gemfile @@ -3,22 +3,25 @@ source 'https://rubygems.org' gem 'rails' + # Use SCSS for stylesheets -gem 'sass-rails', '~> 5.0' +gem 'sass-rails' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' - +gem 'uglifier' # Use jquery as the JavaScript library gem 'jquery-rails' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' - -gem 'get_process_mem', '~> 0.2.7' -gem 'haml-rails', '~> 2.0.0' +gem 'jbuilder' +gem 'get_process_mem' +gem 'haml-rails' gem 'http_accept_language' -gem 'prometheus-client', '~> 4.0' +gem 'prometheus-client' gem 'puma' -gem 'sentry-rails', '~> 5.2' +gem 'sentry-rails' + +# TODO: Add this to the epimorphics package registry as a gem +# gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' +gem 'qonsole-rails', path: '/Users/bogdanadrianmarc/Work/Epimorphics/Projects/LR/qonsole-rails' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console @@ -32,19 +35,15 @@ group :development do gem 'web-console' end +source 'https://rubygems.pkg.github.com/epimorphics' do + gem 'json_rails_logger' + gem 'lr_common_styles' +end + # rubocop:disable Layout/LineLength # TODO: While running the rails app locally for testing you can set gems to your local path # ! These "local" paths do not work with a docker image - use the repo instead -# gem 'qonsole-rails', path: '~/Epimorphics/clients/land-registry/projects/qonsole-rails' -# gem 'json_rails_logger', '~> 1.0.0', path: '~/Epimorphics/shared/json-rails-logger/' -# gem 'lr_common_styles', '~> 1.9.0', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles/' +# gem 'qonsole-rails', path: '.../qonsole-rails' +# gem 'json_rails_logger', path: '.../json-rails-logger' +# gem 'lr_common_styles', path: '.../lr_common_styles' # rubocop:enable Layout/LineLength - -# TODO: In production you want to set this to the gem from the epimorphics github repo -gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' - -# TODO: In production you want to set this to the gem from the epimorphics package repo -source 'https://rubygems.pkg.github.com/epimorphics' do - gem 'json_rails_logger', '~> 1.0.0' - gem 'lr_common_styles', '~> 1.9.0' -end From 1a2565fe88f06312e49167e26f3d145580a58b02 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:25:33 +0100 Subject: [PATCH 04/10] Regenerated Gemfile.lock --- Gemfile.lock | 527 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 320 insertions(+), 207 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f484d58..b3fd767 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,121 +1,178 @@ -GIT - remote: https://github.com/epimorphics/qonsole-rails - revision: 40c646990549c4e8697cf177d6bc47a6ebf09b32 +PATH + remote: /Users/bogdanadrianmarc/Work/Epimorphics/Projects/LR/qonsole-rails specs: - qonsole-rails (0.6.1) - codemirror-rails (~> 5.11) - faraday (~> 0.17.0) - faraday-encoding (~> 0.0.5) - faraday_middleware (~> 0.13.1) - font-awesome-rails (~> 4.7.0.1) - haml-rails (~> 2.0.0) - jquery-datatables-rails (~> 3.4.0) - jquery-rails (~> 4.3.1) - lodash-rails (~> 4.17.4) - modulejs-rails (~> 2.2.0.0) - rails (~> 5.2.4) + qonsole-rails (1.0.0) + faraday + faraday-encoding + faraday_middleware + font-awesome-rails + haml-rails + jquery-datatables-rails + jquery-rails + lodash-rails + modulejs-rails + rails GEM remote: https://rubygems.org/ specs: - actioncable (5.2.7) - actionpack (= 5.2.7) + actioncable (7.2.1.1) + actionpack (= 7.2.1.1) + activesupport (= 7.2.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.2.7) - actionview (= 5.2.7) - activesupport (= 5.2.7) - rack (~> 2.0, >= 2.0.8) + zeitwerk (~> 2.6) + actionmailbox (7.2.1.1) + actionpack (= 7.2.1.1) + activejob (= 7.2.1.1) + activerecord (= 7.2.1.1) + activestorage (= 7.2.1.1) + activesupport (= 7.2.1.1) + mail (>= 2.8.0) + actionmailer (7.2.1.1) + actionpack (= 7.2.1.1) + actionview (= 7.2.1.1) + activejob (= 7.2.1.1) + activesupport (= 7.2.1.1) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.1.1) + actionview (= 7.2.1.1) + activesupport (= 7.2.1.1) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.2) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.7) - activesupport (= 5.2.7) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.1.1) + actionpack (= 7.2.1.1) + activerecord (= 7.2.1.1) + activestorage (= 7.2.1.1) + activesupport (= 7.2.1.1) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.2.1.1) + activesupport (= 7.2.1.1) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.7) - activesupport (= 5.2.7) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.1.1) + activesupport (= 7.2.1.1) globalid (>= 0.3.6) - activemodel (5.2.7) - activesupport (= 5.2.7) - activerecord (5.2.7) - activemodel (= 5.2.7) - activesupport (= 5.2.7) - arel (>= 9.0) - activestorage (5.2.7) - actionpack (= 5.2.7) - activerecord (= 5.2.7) - marcel (~> 1.0.0) - activesupport (5.2.7) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (9.0.0) + activemodel (7.2.1.1) + activesupport (= 7.2.1.1) + activerecord (7.2.1.1) + activemodel (= 7.2.1.1) + activesupport (= 7.2.1.1) + timeout (>= 0.4.0) + activestorage (7.2.1.1) + actionpack (= 7.2.1.1) + activejob (= 7.2.1.1) + activerecord (= 7.2.1.1) + activesupport (= 7.2.1.1) + marcel (~> 1.0) + activesupport (7.2.1.1) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) ast (2.4.2) autoprefixer-rails (10.4.19.0) execjs (~> 2) + base64 (0.2.0) + bigdecimal (3.1.8) bindex (0.8.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - codemirror-rails (5.16.0) - railties (>= 3.0, < 6.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) crass (1.0.6) - erubi (1.10.0) - erubis (2.7.0) - execjs (2.8.1) - faraday (0.17.6) - multipart-post (>= 1.2, < 3) - faraday-encoding (0.0.5) + date (3.3.4) + drb (2.2.1) + erubi (1.13.0) + execjs (2.9.1) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-encoding (0.0.6) faraday - faraday_middleware (0.13.1) - faraday (>= 0.7.4, < 1.0) - ffi (1.15.5) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-aarch64-linux-musl) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm-linux-musl) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86-linux-musl) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.0-x86_64-linux-musl) font-awesome-rails (4.7.0.8) railties (>= 3.2, < 8.0) - get_process_mem (0.2.7) + get_process_mem (1.0.0) + bigdecimal (>= 2.0) ffi (~> 1.0) - globalid (1.0.1) - activesupport (>= 5.0) - govuk_elements_rails (2.0.0) - govuk_frontend_toolkit (>= 4.14.1) + globalid (1.2.1) + activesupport (>= 6.1) + govuk_elements_rails (3.0.2) + govuk_frontend_toolkit (>= 5.2.0) rails (>= 4.1.0) sass (>= 3.2.0) - govuk_frontend_toolkit (4.18.4) - rails (>= 3.1.0) - sass (>= 3.2.0) - govuk_template (0.18.3) + govuk_frontend_toolkit (9.0.1) + railties (>= 3.1.0) + govuk_template (0.26.0) rails (>= 3.1) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt - haml-rails (2.0.1) + haml-rails (2.1.0) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) + haml (>= 4.0.6) railties (>= 5.1) - html2haml (2.2.0) - erubis (~> 2.7.0) - haml (>= 4.0, < 6) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) http_accept_language (2.1.1) - i18n (1.12.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - jbuilder (2.11.5) + io-console (0.7.2) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jquery-datatables-rails (3.4.0) @@ -123,187 +180,243 @@ GEM jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.3.5) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.3) + json (2.7.2) + language_server-protocol (3.17.0.3) lodash-rails (4.17.21) railties (>= 3.1) - lograge (0.12.0) + logger (1.6.1) + lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.19.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (1.0.2) - method_source (1.0.0) - mini_mime (1.1.2) - minitest (5.17.0) + net-imap + net-pop + net-smtp + marcel (1.0.4) + mini_mime (1.1.5) + minitest (5.25.1) modernizr-rails (2.7.1) modulejs-rails (2.2.0.0) railties (>= 4.0) - multipart-post (2.3.0) - nio4r (2.5.9) - nokogiri (1.13.10-x86_64-darwin) + multipart-post (2.4.1) + net-imap (0.4.17) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.0) + net-protocol + nio4r (2.7.3) + nokogiri (1.16.7-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm-linux) + racc (~> 1.4) + nokogiri (1.16.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86-linux) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.13.10-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.22.1) - parser (3.1.1.0) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) - prometheus-client (4.0.0) - puma (6.4.2) + racc + prometheus-client (4.2.3) + base64 + psych (5.1.2) + stringio + puma (6.4.3) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.8) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.7) - actioncable (= 5.2.7) - actionmailer (= 5.2.7) - actionpack (= 5.2.7) - actionview (= 5.2.7) - activejob (= 5.2.7) - activemodel (= 5.2.7) - activerecord (= 5.2.7) - activestorage (= 5.2.7) - activesupport (= 5.2.7) - bundler (>= 1.3.0) - railties (= 5.2.7) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + racc (1.8.1) + rack (3.1.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.2.1.1) + actioncable (= 7.2.1.1) + actionmailbox (= 7.2.1.1) + actionmailer (= 7.2.1.1) + actionpack (= 7.2.1.1) + actiontext (= 7.2.1.1) + actionview (= 7.2.1.1) + activejob (= 7.2.1.1) + activemodel (= 7.2.1.1) + activerecord (= 7.2.1.1) + activestorage (= 7.2.1.1) + activesupport (= 7.2.1.1) + bundler (>= 1.15.0) + railties (= 7.2.1.1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - railties (5.2.7) - actionpack (= 5.2.7) - activesupport (= 5.2.7) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.2.1.1) + actionpack (= 7.2.1.1) + activesupport (= 7.2.1.1) + irb (~> 1.13) + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.0.6) - rb-fsevent (0.11.1) - rb-inotify (0.10.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.2.1) - request_store (1.5.1) + rdoc (6.7.0) + psych (>= 4.0.0) + regexp_parser (2.9.2) + reline (0.5.10) + io-console (~> 0.5) + request_store (1.7.0) rack (>= 1.4) - rexml (3.2.5) - rubocop (1.26.1) + rubocop (1.67.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) - parser (>= 3.1.1.0) - rubocop-rails (2.14.2) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-rails (2.26.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - ruby-progressbar (1.11.0) - ruby_parser (3.19.0) - sexp_processor (~> 4.16) + rubocop (>= 1.52.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.8) - railties (>= 5.2.0) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) ffi (~> 1.9) - sentry-rails (5.2.1) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + securerandom (0.3.1) + sentry-rails (5.21.0) railties (>= 5.0) - sentry-ruby-core (~> 5.2.1) - sentry-ruby-core (5.2.1) - concurrent-ruby - sexp_processor (4.16.0) - sprockets (3.7.2) + sentry-ruby (~> 5.21.0) + sentry-ruby (5.21.0) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + rack (>= 2.2.4, < 4) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - temple (0.8.2) - thor (1.2.2) - thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.11) - thread_safe (~> 0.1) - uglifier (4.2.0) + stringio (3.1.1) + temple (0.10.3) + thor (1.3.2) + tilt (2.4.0) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) - unicode-display_width (2.1.0) - web-console (3.7.0) - actionview (>= 5.0) - activemodel (>= 5.0) + unicode-display_width (2.6.0) + useragent (0.16.10) + web-console (4.2.1) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) bindex (>= 0.4.0) - railties (>= 5.0) - websocket-driver (0.7.5) + railties (>= 6.0.0) + webrick (1.8.2) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) + zeitwerk (2.7.0) GEM remote: https://rubygems.pkg.github.com/epimorphics/ specs: - json_rails_logger (1.0.1) + json_rails_logger (1.0.3) json lograge railties - lr_common_styles (1.9.9) - bootstrap-sass (~> 3.4.0) - font-awesome-rails (~> 4.7.0.1) - govuk_elements_rails (~> 2.0.0) - govuk_frontend_toolkit (~> 4.18.1) - govuk_template (~> 0.18.1) - haml-rails (~> 2.0.0) - jquery-rails (>= 4.3.5, < 4.7.0) - lodash-rails (~> 4.17.14) - modernizr-rails (~> 2.7.1) - modulejs-rails (~> 2.2.0.0) - rails (~> 5.2.4) - sass-rails (~> 5.0.4) + lr_common_styles (2.1.1) + bootstrap-sass + font-awesome-rails + govuk_elements_rails (= 3.0.2) + govuk_frontend_toolkit + govuk_template + haml-rails + jquery-rails + lodash-rails + modernizr-rails + modulejs-rails + rails + sass-rails PLATFORMS - x86_64-darwin-17 - x86_64-darwin-21 - x86_64-darwin-22 + aarch64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86-linux + x86-linux-gnu + x86-linux-musl + x86_64-darwin x86_64-linux + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES byebug - get_process_mem (~> 0.2.7) - haml-rails (~> 2.0.0) + get_process_mem + haml-rails http_accept_language - jbuilder (~> 2.0) + jbuilder jquery-rails - json_rails_logger (~> 1.0.0)! - lr_common_styles (~> 1.9.0)! - prometheus-client (~> 4.0) + json_rails_logger! + lr_common_styles! + prometheus-client puma qonsole-rails! - rails (~> 5.2.4) + rails rubocop rubocop-rails - sass-rails (~> 5.0) - sentry-rails (~> 5.2) - uglifier (>= 1.3.0) + sass-rails + sentry-rails + uglifier web-console BUNDLED WITH - 2.4.8 + 2.5.20 From e9087b10f8c25cb9ba7391441657b44f5fd3c9fb Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:34:52 +0100 Subject: [PATCH 05/10] Added precompiled assets paths to manifest.js --- app/assets/config/manifest.js | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/assets/config/manifest.js diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000..b16e53d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css From 53a24c87f9206586a05053c6d61e7a8dc85503c6 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:35:15 +0100 Subject: [PATCH 06/10] Added LR common styles precompiled assets directives to application.js --- app/assets/javascripts/application.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8d0fccf..785ef0d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,3 +16,12 @@ //= require lodash //= require qonsole_rails/application //= require lr_common_styles/application + +// LR Common Styles specific +//= link favicon/apple-touch-icon.png +//= link favicon/favicon-32x32.png +//= link favicon/favicon-16x16.png +//= link favicon/manifest.json +//= link favicon/safari-pinned-tab.svg +//= link favicon/favicon.ico +//= link favicon/browserconfig.xml From 0dc7302db3a743ebb9e1bc4490dea0020ca2b924 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:35:22 +0100 Subject: [PATCH 07/10] Bumped app version --- app/lib/version.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lib/version.rb b/app/lib/version.rb index 38bc7ca..4890f0a 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true module Version - MAJOR = 1 - MINOR = 8 + MAJOR = 2 + MINOR = 0 REVISION = 0 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}#{SUFFIX && ".#{SUFFIX}"}" From 2e4d623750b73db85a2e56ba6605c92a8f635ef1 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:35:29 +0100 Subject: [PATCH 08/10] Added changelog entries --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dca0376..eeb9a99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ This app presents the landing page experience for landregistry.data.gov.uk, including the SPARQL Qonsole +## 2.0.0 - 2024-10 + +- Upgraded the `qonsole-rails` and `lr_common_styles` gems to latest versions + (which are now running on latest ruby and rails versions as well) +- Upgraded rails to latest version (`7.2.1`) +- Upgraded ruby to latest version (`3.3.5`) + ## 1.8.0 - 2024-09 - (Jon) Create a `config/initializers/load_notification_subscribers.rb` file to From 9f78d2b6afc267284e51d093bb75e43e4b23a1e7 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 16:48:38 +0100 Subject: [PATCH 09/10] Upgraded alpine to 3.20 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a8aa0c4..c87c2f3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: assets auth check clean image lint local publish realclean run tag test vars ACCOUNT?=$(shell aws sts get-caller-identity | jq -r .Account) -ALPINE_VERSION?=3.13 +ALPINE_VERSION?=3.20 AWS_REGION?=eu-west-1 BUNDLER_VERSION?=$(shell tail -1 Gemfile.lock | tr -d ' ') ECR?=${ACCOUNT}.dkr.ecr.eu-west-1.amazonaws.com From 997291a90f60706217aa600d4881a0b69b734154 Mon Sep 17 00:00:00 2001 From: Bogdan Marc Date: Fri, 25 Oct 2024 17:07:20 +0100 Subject: [PATCH 10/10] Fixed typo in Gemfile --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 610c177..8e60a05 100644 --- a/Gemfile +++ b/Gemfile @@ -20,8 +20,7 @@ gem 'puma' gem 'sentry-rails' # TODO: Add this to the epimorphics package registry as a gem -# gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' -gem 'qonsole-rails', path: '/Users/bogdanadrianmarc/Work/Epimorphics/Projects/LR/qonsole-rails' +gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console