Skip to content
This repository was archived by the owner on Nov 12, 2025. It is now read-only.

BET-4779: Update fork (version 20.8.0)#8

Merged
ketenshi merged 293 commits intoconnectfrom
update/merge-upstream
May 29, 2020
Merged

BET-4779: Update fork (version 20.8.0)#8
ketenshi merged 293 commits intoconnectfrom
update/merge-upstream

Conversation

@ketenshi
Copy link
Copy Markdown

@ketenshi ketenshi commented May 28, 2020

Created this branch based on connect and did a rebase on upstream/master.
Afterwards had to merge connect back into here to fix some merge conflicts.

Notable updates:

designatednerd and others added 30 commits March 19, 2020 17:54
…ct-monorepo

Update react monorepo to v16.13.1
…-parsing

Workaround CLI argument parsing issue
…umentation-infrastructure

Update dependency gatsby to v2.20.2
designatednerd and others added 22 commits May 27, 2020 16:59
* connect:
  Revert "Made the websocket public"
  Extend 'WebSocketTransportDelegate' protocol
  Expose 'reconnectionInterval' property
  Extend 'WebSocketTransportDelegate' protocol
  Made connectingPayload public
  Made the websocket public
  Expose 'security' for SSL pinning
  Exposed a method to connect/disconnect
  Extend 'WebSocketTransportDelegate' protocol
  Expose 'reconnectionInterval' property
  Extend 'WebSocketTransportDelegate' protocol
  Made connectingPayload public
  Made the websocket public
  Expose 'security' for SSL pinning
  Exposed a method to connect/disconnect

# Conflicts:
#	Sources/ApolloWebSocket/WebSocketTransport.swift
@ketenshi ketenshi requested review from lealbertta and tahirmt May 28, 2020 21:21
@ketenshi ketenshi changed the title BET-4779: Merge upstream to version 20.8.0 BET-4779: Merge from upstream (version 20.8.0) May 28, 2020
@ketenshi ketenshi changed the title BET-4779: Merge from upstream (version 20.8.0) BET-4779: Update fork (version 20.8.0) May 28, 2020
@lealbertta
Copy link
Copy Markdown

Websocket traffic inspection for Charles Proxy!

🔥

@ketenshi ketenshi merged commit 802f47c into connect May 29, 2020
@ketenshi ketenshi deleted the update/merge-upstream branch May 29, 2020 14:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.