Skip to content

Commit

Permalink
Merge branch 'main' into less-initializers
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelfranca committed Sep 15, 2021
2 parents 6d24f60 + 4a5d8fc commit fd41ea1
Show file tree
Hide file tree
Showing 909 changed files with 24,141 additions and 11,532 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Check out https://help.github.com/articles/ignoring-files for how to set that up.

.Gemfile
.byebug_history
.ruby-version
/*/doc/
/*/test/tmp/
Expand Down
10 changes: 10 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require:
- rubocop-minitest
- rubocop-packaging
- rubocop-performance
- rubocop-rails
Expand Down Expand Up @@ -49,6 +50,9 @@ Layout/CaseIndentation:
Layout/ClosingHeredocIndentation:
Enabled: true

Layout/ClosingParenthesisIndentation:
Enabled: true

# Align comments with method definitions.
Layout/CommentIndentation:
Enabled: true
Expand Down Expand Up @@ -139,6 +143,9 @@ Style/DefWithParentheses:
Style/MethodDefParentheses:
Enabled: true

Style/ExplicitBlockArgument:
Enabled: true

Style/FrozenStringLiteralComment:
Enabled: true
EnforcedStyle: always
Expand Down Expand Up @@ -288,3 +295,6 @@ Performance/DeletePrefix:

Performance/DeleteSuffix:
Enabled: true

Minitest/UnreachableAssertion:
Enabled: true
22 changes: 14 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,27 @@ gem "capybara", ">= 3.26"
gem "selenium-webdriver", ">= 4.0.0.alpha7"

gem "rack-cache", "~> 1.2"
gem "sass-rails"
gem "turbolinks", "~> 5"
gem "webpacker", "~> 5.0", require: ENV["SKIP_REQUIRE_WEBPACKER"] != "true"
gem "stimulus-rails"
gem "turbo-rails"
gem "jsbundling-rails"
gem "cssbundling-rails"
gem "importmap-rails"
gem "tailwindcss-rails"
# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid Active Model (and by extension the entire framework)
# being dependent on a binary library.
gem "bcrypt", "~> 3.1.11", require: false

# This needs to be with require false to avoid it being automatically loaded by
# sprockets.
gem "uglifier", ">= 1.3.0", require: false
gem "terser", ">= 1.1.4", require: false

# Explicitly avoid 1.x that doesn't support Ruby 2.4+
gem "json", ">= 2.0.0"

group :rubocop do
gem "rubocop", ">= 0.90", require: false
gem "rubocop-minitest", require: false
gem "rubocop-packaging", require: false
gem "rubocop-performance", require: false
gem "rubocop-rails", require: false
Expand Down Expand Up @@ -85,7 +89,7 @@ end
group :storage do
gem "aws-sdk-s3", require: false
gem "google-cloud-storage", "~> 1.11", require: false
gem "azure-storage-blob", require: false
gem "azure-storage-blob", "~> 2.0", require: false

gem "image_processing", "~> 1.2"
end
Expand All @@ -95,7 +99,6 @@ gem "aws-sdk-sns", require: false
gem "webmock"

group :ujs do
gem "qunit-selenium"
gem "webdrivers"
end

Expand All @@ -111,12 +114,12 @@ instance_eval File.read local_gemfile if File.exist? local_gemfile

group :test do
gem "minitest-bisect"
gem "minitest-ci", require: false
gem "minitest-retry"
gem "minitest-reporters"

platforms :mri do
gem "stackprof"
gem "byebug"
gem "debug", ">= 1.0.0", require: false
end

gem "benchmark-ips"
Expand Down Expand Up @@ -177,6 +180,9 @@ if RUBY_VERSION >= "3.1"
gem "net-imap", require: false
gem "net-pop", require: false

# digest gem, which is one of the default gems has bumped to 3.0.1.pre for ruby 3.1.0dev.
gem "digest", "~> 3.0.1.pre", require: false

# matrix was removed from default gems in Ruby 3.1, but is used by the `capybara` gem.
# So we need to add it as a dependency until `capybara` is fixed: https://github.com/teamcapybara/capybara/pull/2468
gem "matrix", require: false
Expand Down
Loading

0 comments on commit fd41ea1

Please sign in to comment.