From 4655216e202f062905b7001a2b78a328731bd466 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 09:33:06 +0000 Subject: [PATCH 01/14] Bump oj from 3.16.0 to 3.16.1 Bumps [oj](https://github.com/ohler55/oj) from 3.16.0 to 3.16.1. - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.16.0...v3.16.1) --- updated-dependencies: - dependency-name: oj dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index aad9f9fc..c967ee85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -271,7 +271,7 @@ GEM nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.16.0) + oj (3.16.1) openssl (3.1.0) orm_adapter (0.5.0) parallel (1.23.0) From 4599b0c4b7161a73c54dd07aad70f689da07b855 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 09:33:26 +0000 Subject: [PATCH 02/14] Bump pg from 1.5.3 to 1.5.4 Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.3 to 1.5.4. - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md) - [Commits](https://github.com/ged/ruby-pg/compare/v1.5.3...v1.5.4) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index aad9f9fc..1d167cbd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM parser (3.2.2.3) ast (~> 2.4.1) racc - pg (1.5.3) + pg (1.5.4) pghero (3.3.3) activerecord (>= 6) prometheus-client (4.2.1) From 28818022441c7c6593f8d99f93baf4d0aead4cf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 09:33:59 +0000 Subject: [PATCH 03/14] Bump rubocop from 1.56.1 to 1.56.2 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.56.1 to 1.56.2. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.56.1...v1.56.2) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index aad9f9fc..a4b8144d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -386,7 +386,7 @@ GEM rspec-mocks (~> 3.0) sidekiq (>= 5, < 8) rspec-support (3.12.1) - rubocop (1.56.1) + rubocop (1.56.2) base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) From f1c1155f82450920f830b8311fae73ce874a142d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 09:47:02 +0000 Subject: [PATCH 04/14] Bump stylelint-config-standard-scss from 10.0.0 to 11.0.0 Bumps [stylelint-config-standard-scss](https://github.com/stylelint-scss/stylelint-config-standard-scss) from 10.0.0 to 11.0.0. - [Release notes](https://github.com/stylelint-scss/stylelint-config-standard-scss/releases) - [Changelog](https://github.com/stylelint-scss/stylelint-config-standard-scss/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint-scss/stylelint-config-standard-scss/compare/v10.0.0...v11.0.0) --- updated-dependencies: - dependency-name: stylelint-config-standard-scss dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 54 ++++++++++++++++++++++++++-------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 40aa3a5b..49f471aa 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "eslint": "^7.16.0", "eslint-plugin-import": "^2.28.1", "stylelint": "^15.10.3", - "stylelint-config-standard-scss": "^10.0.0", + "stylelint-config-standard-scss": "^11.0.0", "stylelint-scss": "^5.1.0" } } diff --git a/yarn.lock b/yarn.lock index 336d0fde..83cc6805 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2097,10 +2097,10 @@ postcss-safe-parser@^6.0.0: resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1" integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ== -postcss-scss@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd" - integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ== +postcss-scss@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.7.tgz#cfe5507aaff81b3d8992039ad015da4bd3dccd2f" + integrity sha512-xPv2GseoyXPa58Nro7M73ZntttusuCmZdeOojUFR5PZDz2BR62vfYx1w9TyOnp1+nYFowgOMipsCBhxzVkAEPw== postcss-selector-parser@^6.0.13: version "6.0.13" @@ -2446,36 +2446,36 @@ style-search@^0.1.0: resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg== -stylelint-config-recommended-scss@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-12.0.0.tgz#9d9e82c46012649f11bfebcbc788f58e61860f33" - integrity sha512-5Bb2mlGy6WLa30oNeKpZvavv2lowJUsUJO25+OA68GFTemlwd1zbFsL7q0bReKipOSU3sG47hKneZ6Nd+ctrFA== +stylelint-config-recommended-scss@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-13.0.0.tgz#dd8c319e15a6412262cd8554e4aad9bfba1bbb11" + integrity sha512-7AmMIsHTsuwUQm7I+DD5BGeIgCvqYZ4BpeYJJpb1cUXQwrJAKjA+GBotFZgUEGP8lAM+wmd91ovzOi8xfAyWEw== dependencies: - postcss-scss "^4.0.6" - stylelint-config-recommended "^12.0.0" - stylelint-scss "^5.0.0" + postcss-scss "^4.0.7" + stylelint-config-recommended "^13.0.0" + stylelint-scss "^5.1.0" -stylelint-config-recommended@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-12.0.0.tgz#d0993232fca017065fd5acfcb52dd8a188784ef4" - integrity sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ== +stylelint-config-recommended@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-13.0.0.tgz#c48a358cc46b629ea01f22db60b351f703e00597" + integrity sha512-EH+yRj6h3GAe/fRiyaoO2F9l9Tgg50AOFhaszyfov9v6ayXJ1IkSHwTxd7lB48FmOeSGDPLjatjO11fJpmarkQ== -stylelint-config-standard-scss@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-10.0.0.tgz#159a54a01b80649bf0143fa7ba086b676a1a749e" - integrity sha512-bChBEo1p3xUVWh/wenJI+josoMk21f2yuLDGzGjmKYcALfl2u3DFltY+n4UHswYiXghqXaA8mRh+bFy/q1hQlg== +stylelint-config-standard-scss@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-11.0.0.tgz#98332b68a9c98b6fce54c7698741e103719942b5" + integrity sha512-fGE79NBOLg09a9afqGH/guJulRULCaQWWv4cv1v2bMX92B+fGb0y56WqIguwvFcliPmmUXiAhKrrnXilIeXoHA== dependencies: - stylelint-config-recommended-scss "^12.0.0" - stylelint-config-standard "^33.0.0" + stylelint-config-recommended-scss "^13.0.0" + stylelint-config-standard "^34.0.0" -stylelint-config-standard@^33.0.0: - version "33.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-33.0.0.tgz#1f7bb299153a53874073e93829e37a475842f0f9" - integrity sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg== +stylelint-config-standard@^34.0.0: + version "34.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-34.0.0.tgz#309f3c48118a02aae262230c174282e40e766cf4" + integrity sha512-u0VSZnVyW9VSryBG2LSO+OQTjN7zF9XJaAJRX/4EwkmU0R2jYwmBSN10acqZisDitS0CLiEiGjX7+Hrq8TAhfQ== dependencies: - stylelint-config-recommended "^12.0.0" + stylelint-config-recommended "^13.0.0" -stylelint-scss@^5.0.0, stylelint-scss@^5.1.0: +stylelint-scss@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.1.0.tgz#dd318bc5c65f7a11f3ecacc7b6e8b67e7f2f1df1" integrity sha512-E+KlQFXv1Euha43qw3q+wKBSli557wxbbo6/39DWhRNXlUa9Cz+FYrcgz+PT6ag0l6UisCYjAGCNhoSl4FcwlA== From e082b0da6e0b4947de24ea5b00dceea9cf0a52bc Mon Sep 17 00:00:00 2001 From: greyidol <110372324+greyidol@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:33:06 +0000 Subject: [PATCH 05/14] use .env and support SMTP configuration --- .gitignore | 3 +++ Gemfile | 1 + Gemfile.lock | 5 +++++ config/environments/production.rb | 36 +++++++++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d50f6f6e..a3735fe5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,9 @@ .byebug_history /config/database.yml +.env +.env.production +.env.development /coverage diff --git a/Gemfile b/Gemfile index ccb988ee..63c1e47c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gem "i18n-js", "4.0" gem "rails", "~> 6.1" gem "rails-i18n", "~> 7.0" +gem "dotenv-rails", "~> 2.8" gem "cssbundling-rails", "~> 1.2" gem "jsbundling-rails", "~> 1.1" diff --git a/Gemfile.lock b/Gemfile.lock index a4b8144d..286fb80b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,6 +130,10 @@ GEM devise (>= 4.8.0) diff-lcs (1.5.0) docile (1.4.0) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) + railties (>= 3.2) dry-core (1.0.0) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) @@ -505,6 +509,7 @@ DEPENDENCIES devise (~> 4.9) devise-async devise-i18n + dotenv-rails (~> 2.8) dry-initializer (~> 3.1) dry-types (~> 1.7) factory_bot_rails diff --git a/config/environments/production.rb b/config/environments/production.rb index 6fe7f142..d86fd21c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -73,8 +73,40 @@ Rails.application.configure do # config.active_job.queue_name_prefix = "justask_#{Rails.env}" config.action_mailer.perform_caching = false - # Use sendmail - config.action_mailer.delivery_method = :sendmail + config.action_mailer.default_options[:reply_to] = ENV['SMTP_REPLY_TO'] if ENV['SMTP_REPLY_TO'].present? + config.action_mailer.default_options[:return_path] = ENV['SMTP_RETURN_PATH'] if ENV['SMTP_RETURN_PATH'].present? + + enable_starttls = nil + enable_starttls_auto = nil + + case ENV['SMTP_ENABLE_STARTTLS'] + when 'always' + enable_starttls = true + when 'never' + enable_starttls = false + when 'auto' + enable_starttls_auto = true + else + enable_starttls_auto = ENV['SMTP_ENABLE_STARTTLS_AUTO'] != 'false' + end + + config.action_mailer.smtp_settings = { + port: ENV['SMTP_PORT'], + address: ENV['SMTP_SERVER'], + user_name: ENV['SMTP_LOGIN'].presence, + password: ENV['SMTP_PASSWORD'].presence, + domain: ENV['SMTP_DOMAIN'] || ENV['LOCAL_DOMAIN'], + authentication: ENV['SMTP_AUTH_METHOD'] == 'none' ? nil : ENV['SMTP_AUTH_METHOD'] || :plain, + ca_file: ENV['SMTP_CA_FILE'].presence || '/etc/ssl/certs/ca-certificates.crt', + openssl_verify_mode: ENV['SMTP_OPENSSL_VERIFY_MODE'], + enable_starttls: enable_starttls, + enable_starttls_auto: enable_starttls_auto, + tls: ENV['SMTP_TLS'].presence && ENV['SMTP_TLS'] == 'true', + ssl: ENV['SMTP_SSL'].presence && ENV['SMTP_SSL'] == 'true', + read_timeout: 20, + } + + config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'sendmail').to_sym # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors. From 13f5d305f82b1252d8af6ec0b7241f0dd5e52507 Mon Sep 17 00:00:00 2001 From: greyidol <110372324+greyidol@users.noreply.github.com> Date: Mon, 4 Sep 2023 21:21:03 +0000 Subject: [PATCH 06/14] implement changes from review --- .gitignore | 1 - Gemfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a3735fe5..9db39c81 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ /config/database.yml .env -.env.production .env.development /coverage diff --git a/Gemfile b/Gemfile index 63c1e47c..3f939f46 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,6 @@ source "https://rubygems.org" gem "i18n-js", "4.0" gem "rails", "~> 6.1" gem "rails-i18n", "~> 7.0" -gem "dotenv-rails", "~> 2.8" gem "cssbundling-rails", "~> 1.2" gem "jsbundling-rails", "~> 1.1" @@ -97,6 +96,7 @@ group :development, :test do gem "simplecov", require: false gem "simplecov-cobertura", require: false gem "simplecov-json", require: false + gem "dotenv-rails", "~> 2.8" end group :production do From e67704e38de8637ea18dfd33a93287660ef6dc18 Mon Sep 17 00:00:00 2001 From: greyidol <110372324+greyidol@users.noreply.github.com> Date: Mon, 4 Sep 2023 23:19:53 +0000 Subject: [PATCH 07/14] fix lint --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3f939f46..a62a4223 100644 --- a/Gemfile +++ b/Gemfile @@ -79,6 +79,7 @@ group :development, :test do gem "better_errors" gem "bullet" gem "database_cleaner" + gem "dotenv-rails", "~> 2.8" gem "factory_bot_rails", require: false gem "faker" gem "haml_lint", require: false @@ -96,7 +97,6 @@ group :development, :test do gem "simplecov", require: false gem "simplecov-cobertura", require: false gem "simplecov-json", require: false - gem "dotenv-rails", "~> 2.8" end group :production do From 175ee50470097f7696365976724779eb93d5dc1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 09:08:11 +0000 Subject: [PATCH 08/14] Bump actions/checkout from 3.6.0 to 4.0.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.6.0...v4.0.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-image.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/lint.yml | 8 ++++---- .github/workflows/retrospring.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 97d283b4..36b98fa1 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -20,7 +20,7 @@ jobs: cancel-in-progress: true steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Discover build-time variables run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f9e7b3ec..da1c33c7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.6.0 + uses: actions/checkout@v4.0.0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 35683ad1..e020e87d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,7 +11,7 @@ jobs: name: Rubocop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files uses: tj-actions/changed-files@v38 @@ -37,7 +37,7 @@ jobs: name: ESLint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files uses: tj-actions/changed-files@v38 @@ -63,7 +63,7 @@ jobs: haml-lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files uses: tj-actions/changed-files@v38 @@ -86,7 +86,7 @@ jobs: stylelint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files uses: tj-actions/changed-files@v38 diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml index 31d1cae1..fefbfc04 100644 --- a/.github/workflows/retrospring.yml +++ b/.github/workflows/retrospring.yml @@ -41,7 +41,7 @@ jobs: BUNDLE_WITHOUT: 'production' steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Install dependencies run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev - name: Set up Ruby From 3141e5ef8ecadfe7b83e56af74fd07fd05d084b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 09:08:15 +0000 Subject: [PATCH 09/14] Bump reviewdog/action-stylelint from 1.17.1 to 1.18.1 Bumps [reviewdog/action-stylelint](https://github.com/reviewdog/action-stylelint) from 1.17.1 to 1.18.1. - [Release notes](https://github.com/reviewdog/action-stylelint/releases) - [Commits](https://github.com/reviewdog/action-stylelint/compare/v1.17.1...v1.18.1) --- updated-dependencies: - dependency-name: reviewdog/action-stylelint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 35683ad1..4145f00a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -104,7 +104,7 @@ jobs: yarn install --frozen-lockfile if: steps.changed-files.outputs.any_changed == 'true' - name: stylelint - uses: reviewdog/action-stylelint@v1.17.1 + uses: reviewdog/action-stylelint@v1.18.1 with: github_token: ${{ secrets.github_token }} reporter: github-pr-check From 990301f9a37a92b146a8dfe4b76159d9359c050e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 09:52:03 +0000 Subject: [PATCH 10/14] Bump rubocop-rails from 2.20.2 to 2.21.0 Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.20.2 to 2.21.0. - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.20.2...v2.21.0) --- updated-dependencies: - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a62a4223..2149ab0f 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ group :development, :test do gem "rspec-rails", "~> 6.0" gem "rspec-sidekiq", "~> 4.0", require: false gem "rubocop", "~> 1.56" - gem "rubocop-rails", "~> 2.20" + gem "rubocop-rails", "~> 2.21" gem "shoulda-matchers", "~> 5.3" gem "simplecov", require: false gem "simplecov-cobertura", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 11a5595d..93a21166 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -253,7 +253,7 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.4) - minitest (5.19.0) + minitest (5.20.0) msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) @@ -404,7 +404,7 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -556,7 +556,7 @@ DEPENDENCIES rspec-rails (~> 6.0) rspec-sidekiq (~> 4.0) rubocop (~> 1.56) - rubocop-rails (~> 2.20) + rubocop-rails (~> 2.21) rubyzip (~> 2.3) sanitize sassc-rails From 3e856c44f27e03be1815f7b823fe701b4c0cc9b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 09:52:19 +0000 Subject: [PATCH 11/14] Bump sprockets from 4.2.0 to 4.2.1 Bumps [sprockets](https://github.com/rails/sprockets) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/rails/sprockets/releases) - [Changelog](https://github.com/rails/sprockets/blob/main/CHANGELOG.md) - [Commits](https://github.com/rails/sprockets/compare/v4.2.0...v4.2.1) --- updated-dependencies: - dependency-name: sprockets dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a62a4223..d2456bc0 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem "rails-i18n", "~> 7.0" gem "cssbundling-rails", "~> 1.2" gem "jsbundling-rails", "~> 1.1" gem "sassc-rails" -gem "sprockets", "~> 4.1" +gem "sprockets", "~> 4.2" gem "sprockets-rails", require: "sprockets/railtie" gem "pg" diff --git a/Gemfile.lock b/Gemfile.lock index 11a5595d..8dee81f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -450,7 +450,7 @@ GEM simplecov simplecov_json_formatter (0.1.4) spring (4.1.1) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) @@ -569,7 +569,7 @@ DEPENDENCIES simplecov-cobertura simplecov-json spring (~> 4.1) - sprockets (~> 4.1) + sprockets (~> 4.2) sprockets-rails tldv (~> 0.1.0) turbo-rails From 38a945951d45216019a05391fe4ca8cfb58b6d2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 09:52:30 +0000 Subject: [PATCH 12/14] Bump pghero from 3.3.3 to 3.3.4 Bumps [pghero](https://github.com/ankane/pghero) from 3.3.3 to 3.3.4. - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v3.3.3...v3.3.4) --- updated-dependencies: - dependency-name: pghero dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 11a5595d..fe4b53fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -253,7 +253,7 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.4) - minitest (5.19.0) + minitest (5.20.0) msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) @@ -283,7 +283,7 @@ GEM ast (~> 2.4.1) racc pg (1.5.4) - pghero (3.3.3) + pghero (3.3.4) activerecord (>= 6) prometheus-client (4.2.1) public_suffix (5.0.1) From 9e2612dda6cbfebba6b51829794ef4589496ca59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 09:53:42 +0000 Subject: [PATCH 13/14] Bump rubocop from 1.56.2 to 1.56.3 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.56.2 to 1.56.3. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.56.2...v1.56.3) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 11a5595d..fbfddd4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -390,7 +390,7 @@ GEM rspec-mocks (~> 3.0) sidekiq (>= 5, < 8) rspec-support (3.12.1) - rubocop (1.56.2) + rubocop (1.56.3) base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) From 828d598737f4c66c595f6b11746d475aaafe37d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 20:53:22 +0000 Subject: [PATCH 14/14] Bump tj-actions/changed-files from 38 to 39 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 38 to 39. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v38...v39) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/lint.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e020e87d..b349edf2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: files: "**/*.rb" - name: Install dependencies @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: files: "**/*.ts" - name: Set up Node 14 @@ -66,7 +66,7 @@ jobs: - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: files: "**/*.haml" - name: Install dependencies @@ -89,7 +89,7 @@ jobs: - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: files: "**/*.scss" - name: Set up Node 14