[TBT-84] Enterprise merge #1330
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
Co-authored-by: gabriel-arc <[email protected]>
* repo settings merge from master
* Rspec are loading & some deprecation fixes * some Arel and handling string as hash * No more composite keys * fixing deprecations for rake - parsing json * fixing deprecations * further cleanup * Some fixex including repo - but logic must be discussed * cleanup with composite keys * Revert "cleanup with composite keys" This reverts commit c9c7960. * Revert "No more composite keys" This reverts commit 8fb395e. * further changes and fixes * More spohisticated changes * ruby, ar upgrade && annoying bug fix for composite keys * Cleanup after not proper fixes * sentry & openssl upgrade * add root to serialized json * Proper gems are used * USing old Metrics * Next fixes * almost there * All green * Further gems update * problems with simple states * removing s3 step 1 * moving s3 to fog * s3 totally removed * some Gemfile changes * docker fix * sidekiq update * better regexp * Nicely usage of Mustermann * guard for AR patch * clear active connections * nokogiri bump * Parse config if string * Ensure Hash is saved into Json settings/preferences * next approach to make settings an actual hash * Ensure settings/preferences are hash Co-authored-by: Maciej <[email protected]> Co-authored-by: gabriel-arc <[email protected]>
* github_apps update * activerecord bump to 6.1.6.1 * permit symbol in yaml deserializer for debug
* BSFY-141 merge - add restarted by
* bundler update * merge from master 31.10.22 * usr/group update * ship:docker
* Add tag_name to build request * Restrict ruby gem-update version --------- Co-authored-by: piccadilly-circus <[email protected]>
DominikAlberski
approved these changes
Jul 23, 2024
Merged
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.
No description provided.