Skip to content

Merge dev changes into dev-infrastructure#154

Merged
ijdickinson merged 57 commits intodev-infrastructurefrom
issue/71-locality-field-dev-infra
Jan 10, 2022
Merged

Merge dev changes into dev-infrastructure#154
ijdickinson merged 57 commits intodev-infrastructurefrom
issue/71-locality-field-dev-infra

Conversation

@ijdickinson
Copy link
Contributor

@ijdickinson ijdickinson commented Jan 10, 2022

This PR merges the latest changes from dev into dev-infrastructure, in order to address epimorphics/hmlr-linked-data#71 (missing locality field).

In order to reflect that this is a significant change, I've updated the semver from 1.4.x to 1.5.0

  • Update gemfile.lock
  • Update Gemfile.lock
  • Include lr_common_styles javascript
  • Temporarily pin Faraday to lower version
  • Minor change to trigger rebuild
  • Reset data service API dependency
  • Remove Faraday restriction
  • Add config variable for privacy route
  • Update version number and changelog
  • Fix rubocop linting error
  • Bundle update to pull in latest lr_common_styles
  • Fix rubocop linting errors
  • epimorphics
  • epimorphics/hmlr-linked-data#39 adding search field for locality param
  • epimorphics/hmlr-linked-data#39 replace deleted ssh script
  • epimorphics/hmlr-linked-data#39 add more useful placeholder
  • epimorphics/hmlr-linked-data#39 adding locality to test suite for search params
  • epimorphics/hmlr-linked-data#39 adding unit test for just locality search
  • epimorphics/hmlr-linked-data#39 making rubocop happy

ijdickinson and others added 25 commits June 11, 2021 14:33
…config

Add privacy route to environment config variable
Bundle update to pull in latest lr_common_styles
…out-test

Issue/39 locality field without test
This commit merges changes that have been commited to the `dev` branch
into `dev-infrastructure`. In particular, doing this should address
epimorphics/hmlr-linked-data#71, which notes that the `locality` search
field, which has been added to the production service, is not available
on the dev service.

In order to correctly reflect the degree of change involved, I have
update the semver from 1.4.x to 1.5.0
Copy link
Contributor

@bogdanadrianmarc bogdanadrianmarc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 👍

@ijdickinson ijdickinson merged commit f5ecb95 into dev-infrastructure Jan 10, 2022
@ijdickinson ijdickinson deleted the issue/71-locality-field-dev-infra branch January 10, 2022 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants