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

Release v1.7.6 #124

Merged
merged 21 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cbd3cab
fix: resolves missing ppd doc issue
jonrandahl Mar 12, 2024
1f73fa2
test: updated ppd doc link tests
jonrandahl Mar 12, 2024
eb4b934
style: rubocop automatic fixes
jonrandahl Mar 12, 2024
623fdfb
build: updated gem system update version
jonrandahl Mar 12, 2024
5cb8752
build: updated version PATCH cadence
jonrandahl Mar 12, 2024
f345a8f
docs: Updated CHANGELOG
jonrandahl Mar 12, 2024
7e69aad
fix: reset redirects to 302 temporary as a safety precaution
jonrandahl Mar 13, 2024
23f1bed
Merge pull request #118 from epimorphics/issue/145-missing-detailed-p…
jonrandahl Mar 13, 2024
d7ecf2f
Merge remote-tracking branch 'origin/dev-infrastructure' into issue/1…
jonrandahl Mar 13, 2024
0866da7
fix: resolving too many redirections
jonrandahl Mar 13, 2024
b4de49f
docs: Updated CHANGELOG
jonrandahl Mar 13, 2024
c3284d4
Merge pull request #120 from epimorphics/issue/145-missing-detailed-p…
jonrandahl Mar 13, 2024
a68647b
revert: removes all changes from routes.rb
jonrandahl Mar 13, 2024
ff84d5e
fix: hard-coded link paths
jonrandahl Mar 13, 2024
be0414c
docs: Updated CHANGELOG
jonrandahl Mar 13, 2024
bbb836b
chore: fixed punctuation in CHANGELOG entry
jonrandahl Mar 13, 2024
0c71a8d
Merge pull request #121 from epimorphics/issue/145-missing-detailed-p…
jonrandahl Mar 13, 2024
4ddf6f7
Merge pull request #122 from epimorphics/dev-infrastructure
jonrandahl Mar 15, 2024
bdb0d9c
Update deployment.yaml
jonrandahl Apr 30, 2024
6a840ed
docs: updated CHANGELOG
jonrandahl May 31, 2024
e01bfd5
Merge pull request #123 from epimorphics/task/release-candidate-v1.7.6
jonrandahl May 31, 2024
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
This app presents the landing page experience for landregistry.data.gov.uk,
including the SPARQL Qonsole

## 1.7.6 - 2024-06

- (Jon) - Updated the deployment.yaml file to mirror the new branch names post
branch cleanup.
- (Jon) Reconfigured the `detailed documentation` links, both english and welsh,
to point to the `app/doc/ppd` path; alongside adding tests querying the new
route to ensure the route is valid and contains the expected content. All
redirections for any old routes will now handled by the proxy server.

## 1.7.5 - 2023-11-23

- (Jon) Updated the `lr_common_styles` gem to the latest 1.9.3 patch release.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apk add --update \
nodejs \
tzdata \
&& rm -rf /var/cache/apk/* \
&& gem update --system \
&& gem update --system 3.4.22 \
&& gem install bundler:$BUNDLER_VERSION \
&& bundle config --global frozen 1

Expand Down
1 change: 0 additions & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ def set_locale
def change_default_caching_policy
expires_in 5.minutes, public: true, must_revalidate: true if Rails.env.production?
end

end
2 changes: 1 addition & 1 deletion app/lib/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Version
MAJOR = 1
MINOR = 7
REVISION = 5
REVISION = 6
SUFFIX = nil
VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}#{SUFFIX && ".#{SUFFIX}"}"
end
3 changes: 1 addition & 2 deletions app/views/landing/_index_cy.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@
%h3.heading-small Gwybodaeth bellach
%ul.list.list-bullet
%li
= link_to( ppd_doc_path ) do
dogfennaeth fanwl
= link_to('dogfennaeth fanwl', '/app/doc/ppd')
am y Data Pris a Dalwyd, y model data, a defnyddio’r data.

%h2#standard-reports.heading-medium Lluniwr Adroddiad Safonol
Expand Down
3 changes: 1 addition & 2 deletions app/views/landing/_index_en.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@
%h3.heading-small Further information
%ul.list.list-bullet
%li
= link_to( ppd_doc_path ) do
detailed documentation
= link_to('detailed documentation', '/app/doc/ppd')
about the Price Paid Data, the data model, and using the data.

%h2#standard-reports.heading-medium Standard Report Builder
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/sentry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if ENV['SENTRY_API_KEY']
Sentry.init do |config|
config.dsn = ENV['SENTRY_API_KEY']
config.environment = ENV['DEPLOYMENT_ENVIRONMENT'] || Rails.env
config.environment = ENV.fetch('DEPLOYMENT_ENVIRONMENT') { Rails.env }
config.enabled_environments = %w[production]
config.release = Version::VERSION
config.breadcrumbs_logger = %i[active_support_logger http_logger]
Expand Down
2 changes: 1 addition & 1 deletion deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ deployments:
- branch: "preprod"
deploy: "preprod"
publish: "preprod"
- branch: "dev-infrastructure"
- branch: "dev"
deploy: "dev"
publish: "dev"
- branch: "[a-zA-Z0-9]+"
10 changes: 8 additions & 2 deletions test/integration/documentation_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@ class DocumentationTest < ActionDispatch::IntegrationTest
assert_equal(302, response.status)
end

test 'PPD docs page' do
get '/doc/ppd'
test 'ppd_doc_path variable links correctly' do
get ppd_doc_path
assert_response :success
end

test 'ppd doc loads correctly' do
get ppd_doc_path
assert_select 'h1', 'Price Paid Linked Data'
assert_select 'h2', 'What does the Price Paid Dataset consist of?'
end
end