Skip to content

Commit

Permalink
Merge branch 'master' into amir/statefulset-RecreatingFailedPod
Browse files Browse the repository at this point in the history
  • Loading branch information
a7i committed Mar 11, 2024
2 parents 3c6ad7a + fd351f2 commit 9f8e146
Show file tree
Hide file tree
Showing 93 changed files with 686 additions and 505 deletions.
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v6.1.0
18.19.1
36 changes: 32 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ require:

AllCops:
DisplayCopNames: true
NewCops: enable
NewCops: disable
Exclude:
- db/schema.rb
- vendor/**/*
- tmp/**/*
- node_modules/**/*

Layout/LineLength:
Max: 120

Metrics/ClassLength:
Enabled: false

Expand Down Expand Up @@ -260,6 +257,34 @@ Rails/HelperInstanceVariable:
Rails/FilePath:
Enabled: false

# TODO: enable
Rails/FindEach:
Enabled: false

# TODO: enable
Rails/IndexBy:
Enabled: false

# TODO: enable
Rails/IndexWith:
Enabled: false

# we don't always need environment
Rails/RakeEnvironment:
Enabled: false

# TODO: enable
Rails/ApplicationController:
Enabled: false

# TODO: enable
Rails/ContentTag:
Enabled: false

# TODO: enable
Rails/UniqueValidationWithoutIndex:
Enabled: false

Gemspec/RequiredRubyVersion:
Enabled: false

Expand All @@ -269,3 +294,6 @@ Style/AccessorGrouping:
# produces false-positives with html-safe, see app/helpers/application_helper.rb
Style/StringConcatenation:
Enabled: false

Style/HashSyntax:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.2.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.8-slim
FROM ruby:3.2.2-slim

# Install dependencies
RUN \
Expand Down
9 changes: 7 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ ruby File.read('.ruby-version').strip

# gems that have rails engines are are always needed
group :preload do
gem 'rails', '~> 6.1.7.6'
gem 'rails', '~> 6.1.7.7'
gem 'dotenv'
gem 'connection_pool'
gem 'marco-polo'
gem 'marco-polo' # TODO: https://github.com/arches/marco-polo/pull/16

# AR extensions
gem 'goldiloader'
Expand Down Expand Up @@ -39,6 +39,7 @@ gem 'octokit'
gem 'faraday', '~> 2.7'
gem 'faraday-net_http_persistent', '~> 2.0'
gem 'faraday-http-cache'
gem 'faraday-retry'
gem 'warden'
gem 'active_hash'
gem 'ansible'
Expand All @@ -50,11 +51,15 @@ gem 'concurrent-ruby'
gem 'vault', git: 'https://github.com/zendesk/vault-ruby.git', ref: '96be391a2fd50a42871c8b9dc3c59fddbdbdc556'
gem 'lograge'
gem 'logstash-event'
gem 'hashdiff', git: 'https://github.com/liufengyun/hashdiff.git' # fails to install on ruby 3.2 from gem when deploying
gem 'diffy'
gem 'validates_lengths_from_database'
gem 'large_object_store'
gem 'parallel'
gem 'stackprof'
gem 'net-smtp'
gem 'net-pop'
gem 'net-imap'

# treat included plugins like gems
Dir[File.join(Bundler.root, 'plugins/*/')].each { |f| gemspec path: f }
Expand Down

0 comments on commit 9f8e146

Please sign in to comment.