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 - #2 #416

Merged
merged 23 commits into from
Jul 24, 2020
Merged

Merge upstream - #2 #416

merged 23 commits into from
Jul 24, 2020

Conversation

richard-cox
Copy link
Member

  • based on Merge upstream #414, this one contains the cloud-foundry --> cf change with lots of noise

nwmac and others added 22 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
* Improve autoscaler e2e logging
- it looks like the AS returns scaling events 1-2 mins after they occur, which is too late for the test
- add additional logging to print out event table data in case of alternative events being raised
- fix logging if wait for events times out
- add hint in later test that depends on AS scaling event

* Ensure only the schedule rule results in scaling events
- switch from TRAVIS_PULL_REQUEST_SLUG to TRAVIS_REPO_SLUG
…loudfoundry#4460)

Co-authored-by: Michal Jura <mjura@users.noreply.github.com>
Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.0 to 3.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](codecov/codecov-node@v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Convert scripts to js so they work on Windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Address PR feedback

Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
…undry#4466)

* Fix 'too long' file paths

* Fix build issues

* Convert scripts to js so they work on Windows

* Fix scss compile on windows

* Improve initial developer experience

* Fix scss compile on windows

* Fix windows build

* Use fs not fs-extra where possible (can work without npm install)

* Remove gulp

* Cleaner fixes for Windows

* Reset

* Fix whitespace

* Fix merge

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
Co-authored-by: Neil MacDougall <nmacdougall@suse.com>
Co-authored-by: Neil MacDougall <nwmac@users.noreply.github.com>
@richard-cox richard-cox added the ready for review Ready for review label Jul 23, 2020
@richard-cox richard-cox self-assigned this Jul 23, 2020
@codecov-commenter
Copy link

codecov-commenter commented Jul 23, 2020

Codecov Report

Merging #416 into master will increase coverage by 0.00%.
The diff coverage is 98.70%.

@@           Coverage Diff           @@
##           master     #416   +/-   ##
=======================================
  Coverage   56.37%   56.38%           
=======================================
  Files         895      895           
  Lines       29200    29205    +5     
  Branches     4219     4219           
=======================================
+ Hits        16462    16466    +4     
- Misses      12738    12739    +1     

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 7298642 into master Jul 24, 2020
@nwmac nwmac deleted the merge-upstream2 branch July 24, 2020 13:32
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.

None yet

3 participants