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.

Sign up for GitHub

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

Updates #623

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Updates #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f7d03d
Update rubygems to 3.4.20 and bundler to 2.4.20
biow0lf Sep 28, 2023
d94bf25
Add rubocop-disable_syntax gem
biow0lf Sep 28, 2023
bd6f56c
Update rubocop config
biow0lf Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require:
- rubocop-disable_syntax
- rubocop-performance
- rubocop-rails

Expand All @@ -9,6 +10,16 @@ AllCops:
- "db/schema.rb"
- "vendor/**/*"

Style/DisableSyntax:
DisableSyntax:
- unless
- ternary
- endless_methods
- numbered_parameters
- shorthand_hash_syntax
- and_or_not
- percent_literals

Style/StringLiterals:
EnforcedStyle: double_quotes

Expand Down
8 changes: 2 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,10 @@ ENV RAILS_ENV production

ENV RAILS_LOG_TO_STDOUT true

ENV RUBYGEMS_VERSION 3.4.19

RUN gem update --system "$RUBYGEMS_VERSION"

ENV BUNDLER_VERSION 2.4.19
RUN gem update --system "3.4.20"

# skipcq: DOK-DL3028
RUN gem install bundler --version "$BUNDLER_VERSION" --force
RUN gem install bundler --version "2.4.20" --force

RUN gem --version

Expand Down
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ end
group :development do
gem "license_finder", require: false
gem "rubocop", require: false
gem "rubocop-disable_syntax", require: false
gem "rubocop-performance", require: false
gem "rubocop-rails", require: false
gem "standard", "1.31.1", require: false
Expand Down
5 changes: 4 additions & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-disable_syntax (0.1.0)
rubocop (>= 1.50)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
Expand Down Expand Up @@ -287,6 +289,7 @@ DEPENDENCIES
rails-pg-extras
rspec-rails (>= 6.0.1)
rubocop
rubocop-disable_syntax
rubocop-performance
rubocop-rails
sshkit
Expand All @@ -298,4 +301,4 @@ RUBY VERSION
ruby 3.2.2p53

BUNDLED WITH
2.4.19
2.4.20