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

Release 1.17 -> staging merge #6889

Merged
merged 91 commits into from
Sep 18, 2024
Merged

Release 1.17 -> staging merge #6889

merged 91 commits into from
Sep 18, 2024

Conversation

arkadius
Copy link
Member

Describe your changes

Checklist before merge

  • Related issue ID is placed at the beginning of PR title in [brackets] (can be GH issue or Nu Jira issue)
  • Code is cleaned from temporary changes and commented out lines
  • Parts of the code that are not easy to understand are documented in the code
  • Changes are covered by automated tests
  • Showcase in dev-application.conf added to demonstrate the feature
  • Documentation added or updated
  • Added entry in Changelog.md describing the change from the perspective of a public distribution user
  • Added MigrationGuide.md entry in the appropriate subcategory if introducing a breaking change
  • Verify that PR will be squashed during merge

wrzontek and others added 30 commits August 27, 2024 13:04
compiler message file broken: key=javadoc.err.msg arguments=javadoc, invalid flag: -Xlint:deprecation
for module with java only sources (flinkMetricsDeferredReporter)
* Switch encryptionEnabled to true as logstash is ready

* Added statisticsPublicKey to resources different for normal and test usage so there's no more need for a encryptionEnabled flag

* Public keys put into encryption.key instead of configs

* Moved statisticsPubliKey setup to use cats Resource

* Review fixes - removed option from StatisticUrlConfig.maybePublicEncryptionKey and everything that follows this change

* Review fixes - PublicEncryptionKey.INSTANCE was only used in StatisticUrlConfig as default, but for all usages a publicEncryptionKey is provided

---------

Co-authored-by: Szymon Bogusz <sbg@touk.pl>
(cherry picked from commit 1b900ea)
* NU-1785 fix input style in the Generated dialog

(cherry picked from commit 3f4c710)

* Updated snapshots (#6714)

Co-authored-by: Dzuming <Dzuming@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dzuming <Dzuming@users.noreply.github.com>
…n fragments (#6725)

* NU-1792 properties save fix when fragment is in a different group than fragments

* NU-1792 format message
* [NU-1752] Fix some broken links in documentation (#6706)

* Fix some broken links

* We don't need to pass user back to the top of the page

---------

Co-authored-by: Szymon Bogusz <sbg@touk.pl>
(cherry picked from commit 162e1c9)

* Some more broken links changes (#6736)

Co-authored-by: Szymon Bogusz <sbg@touk.pl>
(cherry picked from commit 6500e7b)
…t-attempt

Update Cypress snapshots in flaky-test-fix-next-attempt
…t-attempt

Update Cypress snapshots in flaky-test-fix-next-attempt
…t-attempt

Update Cypress snapshots in flaky-test-fix-next-attempt
Copy link
Contributor

github-actions bot commented Sep 17, 2024

none: #6905
⚠️ Be careful! Snapshot changes are not necessarily the cause of the error. Check the logs.

@arkadius arkadius marked this pull request as ready for review September 17, 2024 16:53
arkadius and others added 23 commits September 17, 2024 19:01
# Conflicts:
#	designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Fragment should display dead-ended fragment correct #0.png
# Conflicts:
#	designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Fragment should display dead-ended fragment correct #0.png
…t-attempt

Update Cypress snapshots in flaky-test-fix-next-attempt
#6896)

* Move Validation setting to the bottom in Fragment Input Definition view - fix two more variants

* Updated snapshots (#6897)

Co-authored-by: bartektartanus <bartektartanus@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: bartektartanus <bartektartanus@users.noreply.github.com>
…-bottom-fix-release-1.17-cherry-pick

Update Cypress snapshots in move-validation-to-bottom-fix-release-1.17-cherry-pick
…-fix-release-1.17-cherry-pick

# Conflicts:
#	designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Fragment should allow adding input parameters and display used fragment graph in modal #1.png
…ase-1.17-cherry-pick

Move Validation setting to the bottom in Fragment Input Definition - cherry pick to 1.17
…ging-merge

Update Cypress snapshots in release1.17-to-staging-merge
…ging-merge

Update Cypress snapshots in release1.17-to-staging-merge
@arkadius arkadius merged commit 0c5ee69 into staging Sep 18, 2024
18 checks passed
@arkadius arkadius deleted the release1.17-to-staging-merge branch September 18, 2024 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.