fix: changelog merge error #2396
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brustolin
requested review from
philipphofmann and
armcknight
as code owners
kevinrenskers
added a commit
that referenced
this pull request
Nov 22, 2022
* 8.0.0: ref: Fix typos in OOMTracker (#2431) ref: Make SpanProtocol.data non nullable (#2409) ref: add/improve logging (#2420) ref: bump supported OS versions (#2414) test: shorten some tests (#2428) ref: Remove `- [SentryOptions initWithDict:didFailWithError:]` (#2404) ref: Mark [SpanProtocol setExtraValue:forKey] as deprecated (#2413) typos (#2421) test: Disable NSDataTracker in clearTestState (#2418) Update CHANGELOG.md (#2415) feat: Properly demangle Swift class name (#2162) chore: Create 8.0.0 branch test: include Sentry changes in hash keys (#2412) release: 7.31.2 fix: Crash in Client when reading integrations (#2398) test: tooling improvements (#2400) fix: Don't increase session's error count for dropped events (#2374) Update CHANGELOG.md (#2396) release: 7.31.1 Fix: Set the correct OOM event timestamp (#2394) # Conflicts: # Sentry.xcodeproj/project.pbxproj # SentryPrivate.podspec # scripts/add-sentry-to-vlc.patch
kevinrenskers
added a commit
that referenced
this pull request
Nov 24, 2022
* master: (56 commits) meta: disable swiftlint file length check in TBDBClient.swift (#2435) Revert "test: shorten some tests (#2422)" (#2427) test: shorten some tests (#2422) test: include Sentry changes in hash keys (#2412) release: 7.31.2 fix: Crash in Client when reading integrations (#2398) test: tooling improvements (#2400) fix: Don't increase session's error count for dropped events (#2374) Update CHANGELOG.md (#2396) release: 7.31.1 Fix: Set the correct OOM event timestamp (#2394) test: Fix SentrySerializationTests.testSerializationFailsWithInvalidJSONObject (#2392) feat(hybrid-sdks): Add captureScreenshots to PrivateSDKOnly (#2384) ci: Increase test timeout for iOS 12 (#2391) test: Disable flaky testCrashReportCount1 (#2389) test: Disable flaky testSerializeWithUnderlyingNSException (#2387) build(deps): bump github/codeql-action from 2.1.31 to 2.1.32 (#2386) build(deps): bump fastlane from 2.210.1 to 2.211.0 (#2385) ref: json serialization error reporting (#2355) release: 7.31.0 ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixing what looks like a merge error in changelog.
#skip-changelog