Skip to content
This repository has been archived by the owner on May 21, 2024. It is now read-only.

1.7 upstream refresh #8

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

1.7 upstream refresh #8

wants to merge 33 commits into from

Conversation

joshhayes-sheen-vt
Copy link

Resolved merge and diffing against the most recent upstream tag

	deleted by them: .ruby-version
	both modified:   apnotic.gemspec
	both modified:   lib/apnotic/version.rb

None of the conflicts seemed significant, a few .gemspec dependencies we're actually ahead on, and some version tagging that I brought up to date

n-miyo and others added 30 commits October 22, 2018 23:13
@n-miyo
Support Proxy setting.
ff78e00
@ostinelli
Relax connection pool dependency.
0cfcd9e
@ostinelli
Merge pull request ostinelli#78 from n-miyo/support-proxy
ff72fae 
Support Proxy setting.
@ostinelli
Relax bundler dependency for Travis.
363e989
@ostinelli
Bump version to 1.5.0.
a8cc3e9
@benubois
Fix to ensure one stream is always available.
7541595
@noefroidevaux
Add apns-push-type header
f85b372
@noefroidevaux
Check the value of content-available in background_notification?
2e06257
@ostinelli
Merge pull request ostinelli#85 from noefroidevaux/apns-push-type
b431b57 
Add apns-push-type header
@ostinelli
Merge pull request ostinelli#82 from feedbin/token_fix
b71af58 
Fix to ensure one stream is always available.
@ostinelli
Bump version to 1.6.0.
36a2e36
@ostinelli
Upgrade dev ruby version to 2.7.1 (also, switch to asdf).
c6f1dd4
@ostinelli
Upgrade ruby rake dependency (security).
1c0bec0
@ostinelli
Update README.
1ae07ad
@ostinelli
Update Travis' ruby versions.
49e105d
@ostinelli
Add timeout to .join call.
e30528b
@ostinelli
Bump version to 1.6.1.
09fe3e9
@Sai
Add target-content-id & interruption-level & relevance-score to aps p…
567fffe 
…ayload
@benubois
Merge pull request ostinelli#106 from Sai/add-ios15-payload
2e49648 
Add target-content-id & interruption-level & relevance-score to payload
@ostinelli
Bump to 1.7.0.
f43cdba
@benubois
Switch to monotonic clock.
664ac2f 
This will insulate time calculations from system time.
@soffes
Fix typo
f191ebb
@benubois
Merge pull request ostinelli#110 from soffes/patch-1
9cfe7bc 
Fix readme typo
@benubois
Pin OpenSSL security_level to 1 in development.
3f994bb 
Apple generates development/sandbox SHA-1 signed certificates.

If OpenSSL is configured with a SECLEVEL of 2 or above, an
`OpenSSL::SSL::SSLError: SSL_CTX_use_certificate` exception is raised.
@benubois
Indent method descriptions under method names.
bb86a33
@benubois
Document :auth_method options.
3a2eb41
@benubois
Merge pull request ostinelli#111 from ostinelli/monotonic
d7e7689 
Switch to monotonic clock.
@benubois
Merge pull request ostinelli#112 from ostinelli/security_level
ec0e3f1 
Pin OpenSSL security_level to 1 in development.
@clarkedb
chore: add ruby 3 to travis CI
c3d5ff6
@benubois
Merge pull request ostinelli#115 from clarkedb/chore-add-ruby-3-to-tr…
a777626 
…avis-ci

chore: add ruby 3 to travis CI
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@joshhayes-sheen-vt @n-miyo @ostinelli @benubois @noefroidevaux @Sai @soffes @clarkedb