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

Hub update by merging enterprise. #268

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

Conversation

SebastianKarpetaDev
Copy link
Contributor

No description provided.

DamianSzymanski and others added 21 commits March 18, 2021 20:05
* security updates

* revert activerecord from 5 to 4

* bundler version
* proper logging for sidekiq

* minimum for Ruby 2.5.9 + safe sidekiq

* bump webmock

* Trying with ruby-2.7.5

* force bundler to 2.3.7

* bundler in dockerfile

* jemallock fix

* Jemmaloc 1.1.3

* new sidekiq does not have  -i/--index option

* sidekiq pro 5.1.1

* join if respond_to

* Ruby 2.5.9

* changes in API for Redis

Co-authored-by: Maciej Kempin <[email protected]>
* merge from master

* ship:docker
Gemfile Outdated

gem 'coder'
gem 'gh', git: 'https://github.com/travis-ci/gh'
gem 'gh', git: 'https://github.com/travis-ci/gh', branch: 'tcie3-0_15_2'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here keep master, it's newer

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Gemfile Outdated
@@ -2,7 +2,8 @@ source 'https://rubygems.org'

ruby '3.2.2'

gem 'sidekiq-pro', source: 'https://gems.contribsys.com'
gem 'sidekiq-pro', '~> 5.1.1', source: 'https://gems.contribsys.com'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep versions from master, there's sidekiq-pro / sidekiq 7.2.0,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Gemfile Outdated
@@ -16,7 +17,7 @@ gem 'travis-support', git: 'https://github.com/travis-ci/travis-support'
gem 'metriks', git: 'https://github.com/travis-ci/metriks'
gem 'metriks-librato_metrics', git: 'https://github.com/travis-ci/metriks-librato_metrics'

gem 'marginalia', git: 'https://github.com/travis-ci/marginalia'
gem 'marginalia', git: 'https://github.com/travis-ci/marginalia', branch: '5.x'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep marginalia from master

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Gemfile Outdated
@@ -26,9 +27,10 @@ gem 'pg', '~> 1'
gem 'rake'
gem 'redis'
gem 'rollout', git: 'https://github.com/travis-ci/rollout'
gem 'addressable', '~> 2.8.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.8.6 is on master

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

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.

5 participants