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

Merge upstream #414

Merged
merged 13 commits into from
Jul 24, 2020
Merged

Merge upstream #414

merged 13 commits into from
Jul 24, 2020

Conversation

richard-cox
Copy link
Member

Placeholder PR for final merge upstream before release

nwmac and others added 11 commits July 9, 2020 13:43
* Improve recent and favourites display

* Remove debug logging

* Remove debug logging/subscription leak

* Unit test fix

* Tweaks following review

* Changes following review
- favourite & recent icon changes

Co-authored-by: Richard Cox <richard.cox@suse.com>
)

- missed out from another PR following review
…ind the scaling row (cloudfoundry#4424)

* Improve autoscaler e2e tests

* Remove duplicate fail statement
* Remove encryption key volume

* Remove encrpytion key volume migration from config-init job
* Add support for including breaking changes in the changelog

* Improve the logout experience

* Fix unit tests
* Merge src/frontend from downstream

* Merge src/jetstream from jetstream

* Remove examples/custom-src

* Merge deploy from downstream
Does not include changes to
- deploy/all-in-one/*
- deploy/aio-entrypoint.sh
- deploy/Dockerfile.all-in-one

* Merge build from downstream

* Add missing merge items from deploy

* Updates to package-lock

* Remove fdescribe

* Fix e2e core tests

* Remove favicon from packages/core/src

* Changes following review
…udfoundry#4440)

* Show all favorites for the endpoint favorite if there is only one

* Missing changes
…undry#4444)

* Fix json-viewer dark mode

* Fix profile page and side nav top position following header diet
- Fix side nav top position
- Update fix for profile page to also work in non-desktop mode
…#4453)

* Fix issues with tests not running if build upload fails

* Fix script

* One more fix for script

* Fix white space at start of file
@richard-cox richard-cox self-assigned this Jul 21, 2020
@richard-cox richard-cox marked this pull request as draft July 21, 2020 13:01
@codecov-commenter
Copy link

codecov-commenter commented Jul 21, 2020

Codecov Report

Merging #414 into master will increase coverage by 0.03%.
The diff coverage is 64.51%.

@@            Coverage Diff             @@
##           master     #414      +/-   ##
==========================================
+ Coverage   56.34%   56.37%   +0.03%     
==========================================
  Files         891      895       +4     
  Lines       29143    29200      +57     
  Branches     4217     4219       +2     
==========================================
+ Hits        16421    16462      +41     
- Misses      12722    12738      +16     

@richard-cox richard-cox added ready for review Ready for review and removed do not merge labels Jul 22, 2020
@richard-cox richard-cox marked this pull request as ready for review July 22, 2020 16:46
@richard-cox richard-cox mentioned this pull request Jul 23, 2020
Copy link
Member

@nwmac nwmac left a comment

Choose a reason for hiding this comment

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

LGTM

@nwmac nwmac merged commit 8f68d22 into master Jul 24, 2020
@nwmac nwmac deleted the merge-upstream branch July 24, 2020 07:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review Ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants