Skip to content

Commit

Permalink
Revert "Merge pull request #148 from epimorphics/dev"
Browse files Browse the repository at this point in the history
This reverts commit 03efce4, reversing
changes made to 5975170.
  • Loading branch information
bogdanadrianmarc committed Nov 4, 2024
1 parent 03efce4 commit 779893f
Show file tree
Hide file tree
Showing 10 changed files with 376 additions and 373 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.5
2.6.6
13 changes: 0 additions & 13 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,6 @@
This app presents the landing page experience for landregistry.data.gov.uk,
including the SPARQL Qonsole

## 2.0.1 - 2024-10

- Fixed an issue with CSS for the checkboxes in the Qonsole query form

## 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`)
- (Jon) Removed the public/fees-caluclator.html file as it is no longer needed
[GH-140](https://github.com/epimorphics/lr-landing/issues/140)

## 1.8.0 - 2024-09

- (Jon) Create a `config/initializers/load_notification_subscribers.rb` file to
Expand Down
43 changes: 23 additions & 20 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@

source 'https://rubygems.org'

gem 'rails'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.4'
# Use SCSS for stylesheets
gem 'sass-rails'
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier'
gem 'uglifier', '>= 1.3.0'

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder'
gem 'get_process_mem'
gem 'haml-rails'
gem 'jbuilder', '~> 2.0'

gem 'get_process_mem', '~> 0.2.7'
gem 'haml-rails', '~> 2.0.0'
gem 'http_accept_language'
gem 'prometheus-client'
gem 'prometheus-client', '~> 4.0'
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 'sentry-rails', '~> 5.2'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand All @@ -34,15 +33,19 @@ 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: '.../qonsole-rails'
# gem 'json_rails_logger', path: '.../json-rails-logger'
# gem 'lr_common_styles', path: '.../lr_common_styles'
# 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/'
# 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

0 comments on commit 779893f

Please sign in to comment.