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

Upstream merge 8/16 #408

Merged
merged 2 commits into from
Aug 16, 2021
Merged

Upstream merge 8/16 #408

merged 2 commits into from
Aug 16, 2021

Conversation

abbiefarr
Copy link

@abbiefarr abbiefarr commented Aug 16, 2021

Issue

Addresses #293

  • This change addresses the issue in full
  • This change addresses only certain aspects of the issue
  • This change is a dependency for another issue
  • This change has a dependency from another issue

Description

Upstream merge from bloom-housing/bloom on August 16th.

Conflicts were in these files:

ui-components/package.json
sites/public/src/ListingView.tsx
sites/public/lib/helpers.ts
sites/public/.env.template
backend/core/test/listings/listings.e2e-spec.ts
backend/core/src/seed.ts
backend/core/src/listings/entities/listing.entity.ts
backend/core/src/auth/authz_policy.csv
backend/core/scripts/listings-importer.ts

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Prototype/POC (not to merge)
  • This change is a refactor/address technical debt
  • This change requires a documentation update
  • This change requires a SQL Script

How Can This Be Tested/Reviewed?

  • Desktop View
  • Mobile View

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have reviewed the changes in a desktop view
  • I have reviewed the changes in a mobile view
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have assigned reviewers
  • I have updated the changelog to include a description of my changes

Copy link

@pfeeny5 pfeeny5 left a comment

Choose a reason for hiding this comment

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

Tested on my local and all areas I am familiar with are working as expected.
LGTM.

@abbiefarr abbiefarr merged commit d057245 into main Aug 16, 2021
@abbiefarr abbiefarr deleted the upstream-merge-8-16 branch August 16, 2021 18:14
@willrlin willrlin linked an issue Aug 17, 2021 that may be closed by this pull request
seanmalbert pushed a commit that referenced this pull request Jun 23, 2022
* upstream merge

* Fix obsolete reference to UserRole
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.

Merge from upstream
3 participants