Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue/144 ruby rails upgrades #145

Merged
merged 10 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.6
3.3.5
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
43 changes: 20 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@

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'
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'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand All @@ -33,19 +34,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
Loading