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 #402

Merged
merged 197 commits into from
Jun 29, 2020
Merged

Merge upstream #402

merged 197 commits into from
Jun 29, 2020

Conversation

richard-cox
Copy link
Member

Contains

  • cf app restage fix
  • icon update
  • themeing update

richard-cox and others added 24 commits June 23, 2020 14:37
Last set of store -> core dependency removals
# Conflicts:
#	angular.json
#	package-lock.json
#	src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
… Entities (cloudfoundry#4387)

* WIP

* WIP

* WIP

* Endpoint changes

* Fix failure handling during connect on stepper

* Fix favourites

* Removed some TODOs

* Fixes & todos

* Unit test fixes

* Fixes following merge

* Fix cf unit tests

* Changes following review
Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
…ements

Theming improvements for page header
* Remove action entityLocation (not used)

* Fix restage
- fixes cloudfoundry#4392

* Remove RequestEntityLocation
* Update icons

* Update docker icon and optimize other pngs

* Improve resolution of container icon

* Update e2e test for new icons
@richard-cox richard-cox added the ready for review Ready for review label Jun 29, 2020
@richard-cox richard-cox self-assigned this Jun 29, 2020
@codecov-commenter
Copy link

Codecov Report

Merging #402 into master will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #402      +/-   ##
==========================================
- Coverage   56.48%   56.47%   -0.01%     
==========================================
  Files         886      886              
  Lines       28978    28963      -15     
  Branches     4215     4213       -2     
==========================================
- Hits        16368    16358      -10     
+ Misses      12610    12605       -5     

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 767b9c5 into master Jun 29, 2020
@nwmac nwmac deleted the merge-upstream branch June 29, 2020 14:28
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