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

Merged
merged 84 commits into from
Jun 23, 2020
Merged

Merge upstream #392

merged 84 commits into from
Jun 23, 2020

Conversation

richard-cox
Copy link
Member

@richard-cox richard-cox commented Jun 16, 2020

Contains fix for .. Helm Chart: Icon is missing …

richard-cox and others added 30 commits May 22, 2020 14:57
- an entity service for a space with no org was cached by guid
- an entity service for a space requiring org used cached version
- solution is to make cache id include schema key (determines with/without org)
Signed-off-by: Ben Berry <ben.berry@gsa.gov>
Signed-off-by: Ben Berry <ben.berry@gsa.gov>
…-notes

3.2.1 Version bump and release notes
- overcomes some weird change of permission type
… was incorrect

- add/remove radio button default value governed by add/remove feature flags
- when one is set to false the radio button should be disabled and the other selected
nwmac and others added 16 commits June 4, 2020 23:08
…issions

Make permissions model extension friendly
Helm: Change default image pull policy to Always
…ole-log

Fix errors in console log during setup screens
…y-icon

Use Recent Activity icon that is less easily confused with Refresh
…filename-wrapping

Fix for buildpack filename wrapping on card
…actions

Add copy address and edit to endpoint table view
…ndry#4336)

* Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream

Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](go-yaml/yaml@v2.2.8...v2.3.0)

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

* CI bump

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Neil MacDougall <neil_macdougall@hotmail.com>
…y#4356)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](faye/websocket-extensions-node@0.1.3...0.1.4)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Fail Concourse CI build if imagelist generation fails
@richard-cox richard-cox added the in progress In Progress label Jun 16, 2020
@richard-cox richard-cox self-assigned this Jun 16, 2020
@codecov-commenter
Copy link

codecov-commenter commented Jun 17, 2020

Codecov Report

Merging #392 into master will increase coverage by 0.42%.
The diff coverage is 70.66%.

@@            Coverage Diff             @@
##           master     #392      +/-   ##
==========================================
+ Coverage   59.19%   59.62%   +0.42%     
==========================================
  Files        1052     1057       +5     
  Lines       33119    33281     +162     
  Branches     4643     4671      +28     
==========================================
+ Hits        19606    19843     +237     
+ Misses      13513    13438      -75     

Copy link
Member Author

@richard-cox richard-cox left a comment

Choose a reason for hiding this comment

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

See comments

@richard-cox richard-cox added the needs attention Needs attention label Jun 17, 2020
@richard-cox richard-cox added ready for review Ready for review and removed in progress In Progress needs attention Needs attention labels Jun 17, 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 8cc207d into master Jun 23, 2020
@nwmac nwmac deleted the merge-upstream branch June 23, 2020 09:27
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.

Helm Chart: Icon is missing
4 participants