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

restarted_by feature - merge from master #1248

Merged
merged 2 commits into from
Sep 7, 2022
Merged

Conversation

GbArc
Copy link
Contributor

@GbArc GbArc commented Sep 7, 2022

No description provided.

@GbArc GbArc merged commit e036f1b into enterprise-3.0 Sep 7, 2022
@GbArc GbArc deleted the e3merge_restarted branch September 7, 2022 12:23
DominikAlberski pushed a commit that referenced this pull request Jul 23, 2024
* Update OS for enterprise ship:docker

* gem updates (#1192)

* trivy scan added, docker fix (#1196)

* trivy fix

* security updates [ship:docker] (#1200)

Co-authored-by: gabriel-arc <[email protected]>

* gh update

* update to use latest docker

* added region to s3 query

* gh update - gh token fix (#1223)

* share envs to forks (#1232)

* repo settings merge from master

* extended default timeouts for db, temp workaround for tcie

* timeout spec fix

* Upgrade gems (#1233)

* 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]>

* removed trivy

* gem updates (#1237)

* w/a: removed set_tags call for raven, todo  - migrate to new api'

* rack update -> 2.2.3.1

* job query optimization ship:docker (#1240)

* console fix after pry update

* gem updates + extended access rights for tokens (#1246)

* github_apps update
* activerecord bump to 6.1.6.1
* permit symbol in yaml deserializer for debug

* restarted_by feature - merge from master (#1248)

* BSFY-141 merge - add restarted by

* putting api on a diet (ship:docker) (#1250)

* bump google-protobuf to 3.19.6

* merge from master (#1260)

* bundler update

* merge from master 31.10.22

* usr/group update

* ship:docker

* sinatra up to 2.2.3 (#1264)

* bump travis-lock, travis-settings

* simplecov moved to test group

* sinatra bump to 2.2.4, hostname added for cache queries

* activesupport up to 6.1.7.2

* managing email subscriptions for whole org

* Update gem database_cleaner

* Fix for SUPP-725 ship:docker (#1295)

* [BSFY-277] Add tag_name to build request (#1305)

* Add tag_name to build request

* Restrict ruby gem-update version

---------

Co-authored-by: piccadilly-circus <[email protected]>

* API merge. Enterprise to master.

* TravisCI API  merge. Enterprise to master.

* TravisCI API. Review fixes.

* repo spec

* specs, ship:docker

* TravisCI API. Adding libcurl library.

* libcurl4 ship:docker

* allowance for tcie ship:docker

* allowance ship:docker

* Dockerfile revert ship:docker

* endpoint updates ship:docker

* Implement legacy roles option

* test

---------

Co-authored-by: Damian Szymanski <[email protected]>
Co-authored-by: gabriel-arc <[email protected]>
Co-authored-by: gabriel-arc <[email protected]>
Co-authored-by: gbarc80 <[email protected]>
Co-authored-by: Maciej Kempin <[email protected]>
Co-authored-by: Maciej <[email protected]>
Co-authored-by: GbArc <[email protected]>
Co-authored-by: vitalie <[email protected]>
Co-authored-by: piccadilly-circus <[email protected]>
Co-authored-by: Sebastian Karpeta <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant