From 53dc178ccdf65702c7a79e3b8c0e82d1eed69192 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 09:01:32 +0000 Subject: [PATCH 01/26] Bump pg from 1.4.3 to 1.4.4 Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.4.3...v1.4.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 43bd3c94..b7b72d6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -340,7 +340,7 @@ GEM parallel (1.22.1) parser (3.1.2.1) ast (~> 2.4.1) - pg (1.4.3) + pg (1.4.4) pghero (3.0.1) activerecord (>= 6) poltergeist (1.18.1) From 7905e4961690408d98cd6acf27678aede8f42b2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 09:02:58 +0000 Subject: [PATCH 02/26] Bump dry-types from 1.5.1 to 1.6.1 Bumps [dry-types](https://github.com/dry-rb/dry-types) from 1.5.1 to 1.6.1. - [Release notes](https://github.com/dry-rb/dry-types/releases) - [Changelog](https://github.com/dry-rb/dry-types/blob/main/CHANGELOG.md) - [Commits](https://github.com/dry-rb/dry-types/compare/v1.5.1...v1.6.1) --- updated-dependencies: - dependency-name: dry-types dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index b63d1937..d96e437d 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ gem "rqrcode" gem "rolify", "~> 6.0" gem "dry-initializer", "~> 3.1" -gem "dry-types", "~> 1.4" +gem "dry-types", "~> 1.6" gem "ruby-progressbar" diff --git a/Gemfile.lock b/Gemfile.lock index 43bd3c94..cb524a05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,25 +143,24 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dry-configurable (0.13.0) + dry-container (0.11.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.6) - dry-container (0.9.0) + dry-core (0.9.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.13, >= 0.13.0) - dry-core (0.7.1) - concurrent-ruby (~> 1.0) - dry-inflector (0.2.1) + zeitwerk (~> 2.6) + dry-inflector (0.3.0) dry-initializer (3.1.1) - dry-logic (1.2.0) + dry-logic (1.3.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.5, >= 0.5) - dry-types (1.5.1) + dry-core (~> 0.9, >= 0.9) + zeitwerk (~> 2.6) + dry-types (1.6.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) - dry-core (~> 0.5, >= 0.5) + dry-core (~> 0.9, >= 0.9) dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) + dry-logic (~> 1.3, >= 1.3) + zeitwerk (~> 2.6) equalizer (0.0.11) erubi (1.11.0) excon (0.92.3) @@ -587,7 +586,7 @@ DEPENDENCIES devise-async devise-i18n dry-initializer (~> 3.1) - dry-types (~> 1.4) + dry-types (~> 1.6) factory_bot_rails fake_email_validator faker From 18d6f8e6860fceecfccac250758d89badc2f4082 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:10:22 +0000 Subject: [PATCH 03/26] Bump @babel/core from 7.19.3 to 7.19.6 Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.19.3 to 7.19.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.19.6/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 89 ++++++++++++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 64ca39a7..8a0e095d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "typescript": "^4.8.4" }, "devDependencies": { - "@babel/core": "^7.19.3", + "@babel/core": "^7.19.6", "@babel/preset-env": "^7.19.4", "@rails/webpacker": "5.4.3", "@typescript-eslint/eslint-plugin": "^4.11.0", diff --git a/yarn.lock b/yarn.lock index 47ef9180..263386dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -29,33 +29,33 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz#95c86de137bf0317f3a570e1b6e996b427299747" integrity sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw== -"@babel/core@^7.15.0", "@babel/core@^7.19.3": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.3.tgz#2519f62a51458f43b682d61583c3810e7dcee64c" - integrity sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ== +"@babel/core@^7.15.0", "@babel/core@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f" + integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.3" + "@babel/generator" "^7.19.6" "@babel/helper-compilation-targets" "^7.19.3" - "@babel/helper-module-transforms" "^7.19.0" - "@babel/helpers" "^7.19.0" - "@babel/parser" "^7.19.3" + "@babel/helper-module-transforms" "^7.19.6" + "@babel/helpers" "^7.19.4" + "@babel/parser" "^7.19.6" "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.3" - "@babel/types" "^7.19.3" + "@babel/traverse" "^7.19.6" + "@babel/types" "^7.19.4" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.19.3": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.3.tgz#d7f4d1300485b4547cb6f94b27d10d237b42bf59" - integrity sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ== +"@babel/generator@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.6.tgz#9e481a3fe9ca6261c972645ae3904ec0f9b34a1d" + integrity sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA== dependencies: - "@babel/types" "^7.19.3" + "@babel/types" "^7.19.4" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -227,19 +227,19 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz#309b230f04e22c58c6a2c0c0c7e50b216d350c30" - integrity sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ== +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.0", "@babel/helper-module-transforms@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f" + integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.18.6" + "@babel/helper-simple-access" "^7.19.4" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" + "@babel/traverse" "^7.19.6" + "@babel/types" "^7.19.4" "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" @@ -302,6 +302,13 @@ dependencies: "@babel/types" "^7.18.6" +"@babel/helper-simple-access@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7" + integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg== + dependencies: + "@babel/types" "^7.19.4" + "@babel/helper-skip-transparent-expression-wrappers@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" @@ -361,14 +368,14 @@ "@babel/traverse" "^7.18.11" "@babel/types" "^7.18.10" -"@babel/helpers@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.0.tgz#f30534657faf246ae96551d88dd31e9d1fa1fc18" - integrity sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg== +"@babel/helpers@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz#42154945f87b8148df7203a25c31ba9a73be46c5" + integrity sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw== dependencies: "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" + "@babel/traverse" "^7.19.4" + "@babel/types" "^7.19.4" "@babel/highlight@^7.10.4": version "7.16.7" @@ -388,10 +395,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.18.10", "@babel/parser@^7.19.3": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a" - integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ== +"@babel/parser@^7.18.10", "@babel/parser@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz#b923430cb94f58a7eae8facbffa9efd19130e7f8" + integrity sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" @@ -1048,23 +1055,23 @@ "@babel/parser" "^7.18.10" "@babel/types" "^7.18.10" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.11", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.3": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.3.tgz#3a3c5348d4988ba60884e8494b0592b2f15a04b4" - integrity sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.11", "@babel/traverse@^7.18.6", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6": + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz#7b4c865611df6d99cb131eec2e8ac71656a490dc" + integrity sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.3" + "@babel/generator" "^7.19.6" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.19.3" - "@babel/types" "^7.19.3" + "@babel/parser" "^7.19.6" + "@babel/types" "^7.19.4" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.16.7", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.19.4", "@babel/types@^7.4.4": +"@babel/types@^7.16.7", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.4.4": version "7.19.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7" integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw== From ac20458a114984b0ceb4c5505be0e60ea8b4cc1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 09:10:43 +0000 Subject: [PATCH 04/26] Bump core-js from 3.25.5 to 3.26.0 Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.25.5 to 3.26.0. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.26.0/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 64ca39a7..da4bb580 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@rails/request.js": "^0.0.6", "bootstrap": "^4.6.2", "cheet.js": "^0.3.3", - "core-js": "^3.25.5", + "core-js": "^3.26.0", "croppr": "^2.3.1", "font-awesome": "4.7.0", "i18n-js": "^4.0", diff --git a/yarn.lock b/yarn.lock index 47ef9180..ad61a72b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2651,10 +2651,10 @@ core-js-compat@^3.21.0, core-js-compat@^3.25.1: dependencies: browserslist "^4.21.4" -core-js@^3.16.2, core-js@^3.25.5: - version "3.25.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.5.tgz#e86f651a2ca8a0237a5f064c2fe56cef89646e27" - integrity sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw== +core-js@^3.16.2, core-js@^3.26.0: + version "3.26.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.0.tgz#a516db0ed0811be10eac5d94f3b8463d03faccfe" + integrity sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw== core-util-is@~1.0.0: version "1.0.3" From f567a18606bc2809528dd0f7fd25a0edf4deb8c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 21:23:47 +0000 Subject: [PATCH 05/26] Bump rubocop-rails from 2.16.1 to 2.17.0 Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.16.1 to 2.17.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.16.1...v2.17.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 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 741dba8f..1c899162 100644 --- a/Gemfile +++ b/Gemfile @@ -98,7 +98,7 @@ group :development, :test do gem "rspec-rails", "~> 5.1" gem "rspec-sidekiq", "~> 3.0", require: false gem "rubocop", "~> 1.37" - gem "rubocop-rails", "~> 2.16" + gem "rubocop-rails", "~> 2.17" gem "shoulda-matchers", "~> 5.2" gem "simplecov", require: false gem "simplecov-cobertura", require: false diff --git a/Gemfile.lock b/Gemfile.lock index d337cea7..4e60bf49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -456,7 +456,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.23.0) parser (>= 3.1.1.0) - rubocop-rails (2.16.1) + rubocop-rails (2.17.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -631,7 +631,7 @@ DEPENDENCIES rspec-rails (~> 5.1) rspec-sidekiq (~> 3.0) rubocop (~> 1.37) - rubocop-rails (~> 2.16) + rubocop-rails (~> 2.17) ruby-progressbar sanitize sassc-rails From cd93fa4ec7618eb2d0a74561256308fd31459a52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 21:28:37 +0000 Subject: [PATCH 06/26] Bump rspec-rails from 5.1.2 to 6.0.1 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.1.2 to 6.0.1. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v5.1.2...v6.0.1) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 1c899162..17aa52e2 100644 --- a/Gemfile +++ b/Gemfile @@ -95,7 +95,7 @@ group :development, :test do gem "rake" gem "rspec-its", "~> 1.3" gem "rspec-mocks" - gem "rspec-rails", "~> 5.1" + gem "rspec-rails", "~> 6.0" gem "rspec-sidekiq", "~> 3.0", require: false gem "rubocop", "~> 1.37" gem "rubocop-rails", "~> 2.17" diff --git a/Gemfile.lock b/Gemfile.lock index 4e60bf49..2ff83540 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -423,7 +423,7 @@ GEM rqrcode_core (1.2.0) rspec-core (3.11.0) rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-its (1.3.0) @@ -432,18 +432,18 @@ GEM rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) + rspec-rails (6.0.1) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.11) + rspec-expectations (~> 3.11) + rspec-mocks (~> 3.11) + rspec-support (~> 3.11) rspec-sidekiq (3.1.0) rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) - rspec-support (3.11.0) + rspec-support (3.11.1) rubocop (1.37.1) json (~> 2.3) parallel (~> 1.10) @@ -628,7 +628,7 @@ DEPENDENCIES rqrcode rspec-its (~> 1.3) rspec-mocks - rspec-rails (~> 5.1) + rspec-rails (~> 6.0) rspec-sidekiq (~> 3.0) rubocop (~> 1.37) rubocop-rails (~> 2.17) From 3498bd9072c27cb444d395c74cdfae8c7bc76117 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Thu, 20 Oct 2022 21:13:18 +0200 Subject: [PATCH 07/26] Use data-turbo-method for mod (un)masking link --- app/views/navigation/dropdown/_profile.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/navigation/dropdown/_profile.haml b/app/views/navigation/dropdown/_profile.haml index e9ad76ff..0bccecfd 100644 --- a/app/views/navigation/dropdown/_profile.haml +++ b/app/views/navigation/dropdown/_profile.haml @@ -23,11 +23,11 @@ .dropdown-divider - if current_user.mod? - if moderation_view? - = link_to moderation_toggle_unmask_path, method: :post, class: "dropdown-item" do + = link_to moderation_toggle_unmask_path, class: "dropdown-item", data: { turbo_method: :post } do %i.fa.fa-toggle-on = t(".unmask.disable") - else - = link_to moderation_toggle_unmask_path, method: :post, class: "dropdown-item" do + = link_to moderation_toggle_unmask_path, class: "dropdown-item", data: { turbo_method: :post } do %i.fa.fa-toggle-off = t(".unmask.enable") %a.dropdown-item{ href: mod_anon_block_index_path } From ec5fa089a1bf97f3d4b95aadae87619a70783d81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 21:39:13 +0000 Subject: [PATCH 08/26] Bump fog-aws from 3.14.0 to 3.15.0 Bumps [fog-aws](https://github.com/fog/fog-aws) from 3.14.0 to 3.15.0. - [Release notes](https://github.com/fog/fog-aws/releases) - [Changelog](https://github.com/fog/fog-aws/blob/master/CHANGELOG.md) - [Commits](https://github.com/fog/fog-aws/compare/v3.14.0...v3.15.0) --- updated-dependencies: - dependency-name: fog-aws dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed4870a3..bd230ee7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM dry-logic (~> 1.0, >= 1.0.2) equalizer (0.0.11) erubi (1.11.0) - excon (0.92.3) + excon (0.93.1) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -179,7 +179,7 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - fog-aws (3.14.0) + fog-aws (3.15.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) From 99955e5452496c66f1acc905f4ac341f9a5a36ac Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Mon, 24 Oct 2022 23:43:53 +0200 Subject: [PATCH 09/26] Replace Lato font with Lexend --- app/javascript/styles/_variables.scss | 17 ++++++----------- app/javascript/styles/application.scss | 11 ++++++++++- package.json | 2 +- yarn.lock | 10 +++++----- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/app/javascript/styles/_variables.scss b/app/javascript/styles/_variables.scss index e94f0595..1f784d56 100644 --- a/app/javascript/styles/_variables.scss +++ b/app/javascript/styles/_variables.scss @@ -1,14 +1,9 @@ // Font settings -$lato-font-path: "~lato-font/fonts"; -$lato-variants: ( - "normal" : 400, - "semibold" : 500, - "bold" : 600, -); +$lexend-font-path: "~@fontsource/lexend/files"; +$lexend-weights: 400, 500, 600; +$fa-font-path: "~font-awesome/fonts"; -$fa-font-path: "~font-awesome/fonts"; - -$font-family-sans-serif: "Lato","Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; +$font-family-sans-serif: "Lexend", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; $font-family-serif: Georgia, "DejaVu Serif", "Times New Roman", Times, serif; $font-family-monospace: "PragmataPro", Monaco, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace; $font-family-base: $font-family-sans-serif; @@ -41,7 +36,7 @@ $nprogress-color: lighten($primary, 25%); // Color names for theme generation $color-names: ( - "primary", + "primary", "danger", "warning", "info", @@ -83,7 +78,7 @@ $spacers: ( color: RGB(var(--*-text)); And for transparent usage, use: - color: rgba(var(--*-text), .7); + color: rgba(var(--*-text), .7); The uppercase RGB is required because internally SassC wants more than one argument for rgb(), diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index a90394a5..57944071 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -4,6 +4,7 @@ Variable definitions, tools and mixins used across all styling definitions. */ +@use "~@fontsource/lexend/scss/mixins" as Lexend; @import "variables"; @@ -19,10 +20,18 @@ "~bootstrap/scss/bootstrap", "~croppr/dist/croppr", "~font-awesome/scss/font-awesome", -"~lato-font/scss/lato-font", "~sweetalert/dist/sweetalert", "~toastify-js/src/toastify"; + +@each $weight in $lexend-weights { + @include Lexend.fontFace( + $weight: $weight, + $display: fallback, + $fontDir: "~@fontsource/lexend/files" + ); +} + /** OVERRIDES ---------------------------------------------- diff --git a/package.json b/package.json index 64ca39a7..ffe77b4f 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ }, "dependencies": { "@babel/preset-typescript": "^7.18.6", + "@fontsource/lexend": "^4.5.13", "@hotwired/turbo-rails": "^7.1.3", "@melloware/coloris": "^0.16.1", "@rails/request.js": "^0.0.6", @@ -16,7 +17,6 @@ "i18n-js": "^4.0", "jquery": "^3.6.1", "js-cookie": "2.2.1", - "lato-font": "^3.0.0", "popper.js": "^1.16.1", "rails_admin": "3.0.0", "regenerator-runtime": "^0.13.10", diff --git a/yarn.lock b/yarn.lock index 47ef9180..06051c1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1093,6 +1093,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@fontsource/lexend@^4.5.13": + version "4.5.13" + resolved "https://registry.yarnpkg.com/@fontsource/lexend/-/lexend-4.5.13.tgz#a22076e1393af0f075e945fcffc9ffa514805304" + integrity sha512-lJjBMU9Jmi2a/QqLRBhwe862385UyS2RckS3ATr8jHAq1JFLxox2p2gODNzhaWo0ZwTjDxIJ0YfMiEzSdyqZ0w== + "@fortawesome/fontawesome-free@^5.15.4": version "5.15.4" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5" @@ -4748,11 +4753,6 @@ last-call-webpack-plugin@^3.0.0: lodash "^4.17.5" webpack-sources "^1.1.0" -lato-font@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lato-font/-/lato-font-3.0.0.tgz#91b837e2374b668fb7331d44c894d37a2d9f8e11" - integrity sha1-kbg34jdLZo+3Mx1EyJTTei2fjhE= - levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" From f6abb8a8ca4d68eff7efb5f68f9fb8d7fc16fc2b Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Tue, 25 Oct 2022 17:13:43 +0200 Subject: [PATCH 10/26] Use body font in sweet-alert --- app/javascript/styles/overrides/_sweet-alert.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/javascript/styles/overrides/_sweet-alert.scss b/app/javascript/styles/overrides/_sweet-alert.scss index cd16be18..78bea1b0 100644 --- a/app/javascript/styles/overrides/_sweet-alert.scss +++ b/app/javascript/styles/overrides/_sweet-alert.scss @@ -1,3 +1,7 @@ +.sweet-alert { + font-family: inherit; +} + .sweet-overlay { z-index: 1031; -} \ No newline at end of file +} From 430abe87430b2c733e66e5349c78f33e988d61a4 Mon Sep 17 00:00:00 2001 From: Georg Gadinger Date: Tue, 25 Oct 2022 16:43:04 +0200 Subject: [PATCH 11/26] make the shared links visible everywhere again --- app/views/layouts/feed.haml | 3 ++- app/views/layouts/feedback.haml | 2 ++ app/views/layouts/notifications.haml | 2 ++ app/views/layouts/user/profile.haml | 2 ++ app/views/layouts/user/settings.haml | 2 ++ app/views/settings/_account.haml | 2 -- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/feed.haml b/app/views/layouts/feed.haml index ee86df7c..4e91be24 100644 --- a/app/views/layouts/feed.haml +++ b/app/views/layouts/feed.haml @@ -4,4 +4,5 @@ = render 'layouts/messages' = render 'tabs/feed', lists: @lists, list: @list = yield - .d-block.d-sm-none= render 'shared/links' + += render 'shared/links' diff --git a/app/views/layouts/feedback.haml b/app/views/layouts/feedback.haml index f264b929..132267f9 100644 --- a/app/views/layouts/feedback.haml +++ b/app/views/layouts/feedback.haml @@ -12,5 +12,7 @@ .card-body = yield += render 'shared/links' + :ruby parent_layout "base" diff --git a/app/views/layouts/notifications.haml b/app/views/layouts/notifications.haml index b600954d..d7c87e7e 100644 --- a/app/views/layouts/notifications.haml +++ b/app/views/layouts/notifications.haml @@ -5,6 +5,8 @@ .col-md-9.col-xs-12.col-sm-8 = yield +.d-block.d-sm-none= render "shared/links" + :ruby Notification.for(current_user).update_all(new: false) parent_layout 'base' diff --git a/app/views/layouts/user/profile.haml b/app/views/layouts/user/profile.haml index 0eb66d37..e0673ed2 100644 --- a/app/views/layouts/user/profile.haml +++ b/app/views/layouts/user/profile.haml @@ -15,3 +15,5 @@ - if current_user.mod? && @user != current_user = render 'modal/privileges', user: @user = render 'modal/ban', user: @user + +.d-block.d-sm-none= render 'shared/links' diff --git a/app/views/layouts/user/settings.haml b/app/views/layouts/user/settings.haml index 5f238bab..16321d39 100644 --- a/app/views/layouts/user/settings.haml +++ b/app/views/layouts/user/settings.haml @@ -5,3 +5,5 @@ .col-md-9.col-xs-12.col-sm-8 = render 'layouts/messages' = yield + +.d-block.d-sm-none= render "shared/links" diff --git a/app/views/settings/_account.haml b/app/views/settings/_account.haml index d914f2fe..9416a8a0 100644 --- a/app/views/settings/_account.haml +++ b/app/views/settings/_account.haml @@ -19,5 +19,3 @@ %hr/ %p= t(".delete.heading") %p= link_to t(".delete.action"), "/settings/account", data: { turbo_confirm: t(".delete.confirm"), turbo_method: :delete }, class: "btn btn-danger btn-xs" - -.visible-xs= render "shared/links" From bc1fc507804d5ba105f961192c64e4813c518f45 Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Tue, 25 Oct 2022 17:13:07 +0200 Subject: [PATCH 12/26] Prevent comments from submitting after input as composition ends --- .../features/answerbox/comment/index.ts | 6 ++++-- .../features/answerbox/comment/new.ts | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/javascript/retrospring/features/answerbox/comment/index.ts b/app/javascript/retrospring/features/answerbox/comment/index.ts index 29604203..b9644012 100644 --- a/app/javascript/retrospring/features/answerbox/comment/index.ts +++ b/app/javascript/retrospring/features/answerbox/comment/index.ts @@ -1,7 +1,7 @@ import registerEvents from "retrospring/utilities/registerEvents" import { commentCharacterCountHandler } from "./count"; import { commentDestroyHandler } from "./destroy"; -import { commentCreateHandler } from "./new"; +import {commentComposeEnd, commentComposeStart, commentCreateHandler} from "./new"; import { commentReportHandler } from "./report"; import { commentSmileHandler } from "./smile"; import { commentToggleHandler } from "./toggle"; @@ -12,7 +12,9 @@ export default (): void => { { type: 'click', target: '[name=ab-smile-comment]', handler: commentSmileHandler, global: true }, { type: 'click', target: '[data-action=ab-comment-report]', handler: commentReportHandler, global: true }, { type: 'click', target: '[data-action=ab-comment-destroy]', handler: commentDestroyHandler, global: true }, + { type: 'compositionstart', target: '[name=ab-comment-new]', handler: commentComposeStart, global: true }, + { type: 'compositionend', target: '[name=ab-comment-new]', handler: commentComposeEnd, global: true }, { type: 'keyup', target: '[name=ab-comment-new]', handler: commentCreateHandler, global: true }, { type: 'input', target: '[name=ab-comment-new]', handler: commentCharacterCountHandler, global: true } ]); -} \ No newline at end of file +} diff --git a/app/javascript/retrospring/features/answerbox/comment/new.ts b/app/javascript/retrospring/features/answerbox/comment/new.ts index 6f729165..e97c497b 100644 --- a/app/javascript/retrospring/features/answerbox/comment/new.ts +++ b/app/javascript/retrospring/features/answerbox/comment/new.ts @@ -3,7 +3,14 @@ import { post } from '@rails/request.js'; import I18n from 'retrospring/i18n'; import { showNotification, showErrorNotification } from 'utilities/notifications'; +let compositionJustEnded = false; + export function commentCreateHandler(event: KeyboardEvent): boolean { + if (compositionJustEnded && event.which == 13) { + compositionJustEnded = false; + return; + } + const input = event.target as HTMLInputElement; const id = input.dataset.aId; const counter = document.querySelector(`#ab-comment-charcount-${id}`); @@ -50,4 +57,14 @@ export function commentCreateHandler(event: KeyboardEvent): boolean { input.disabled = false; }); } -} \ No newline at end of file +} + +export function commentComposeStart(): boolean { + compositionJustEnded = false; + return true; +} + +export function commentComposeEnd(): boolean { + compositionJustEnded = true; + return true; +} From d701cecee1e62bd340586dfaeda768eab8b29b0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 17:08:06 +0000 Subject: [PATCH 13/26] Bump puma from 5.6.5 to 6.0.0 Bumps [puma](https://github.com/puma/puma) from 5.6.5 to 6.0.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.5...v6.0.0) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 68c48a38..892228c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -350,7 +350,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.7) - puma (5.6.5) + puma (6.0.0) nio4r (~> 2.0) questiongenerator (1.0.0) racc (1.6.0) From 3b1fa4da84bc7c0435f0f12357869aca81e3324f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 17:18:50 +0000 Subject: [PATCH 14/26] Bump haml from 5.2.2 to 6.0.7 Bumps [haml](https://github.com/haml/haml) from 5.2.2 to 6.0.7. - [Release notes](https://github.com/haml/haml/releases) - [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md) - [Commits](https://github.com/haml/haml/compare/v5.2.2...v6.0.7) --- updated-dependencies: - dependency-name: haml dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 2eaef7d5..5cf0584a 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem "devise-i18n" gem "fog-aws" gem "fog-core" gem "fog-local" -gem "haml", "~> 5.0" +gem "haml", "~> 6.0" gem "hcaptcha", "~> 7.0" gem "mini_magick" gem "oj" diff --git a/Gemfile.lock b/Gemfile.lock index 892228c4..cd5ebf12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,8 +213,9 @@ GEM guard (>= 2.0.0) guard-compat (~> 1.0) guard-compat (1.2.1) - haml (5.2.2) - temple (>= 0.8.0) + haml (6.0.7) + temple (>= 0.8.2) + thor tilt haml_lint (0.42.0) haml (>= 4.0, < 6.1) @@ -512,7 +513,7 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sysexits (1.2.0) - temple (0.8.2) + temple (0.9.1) thor (1.2.1) thread_safe (0.3.6) tilt (2.0.11) @@ -594,7 +595,7 @@ DEPENDENCIES fog-core fog-local guard-brakeman - haml (~> 5.0) + haml (~> 6.0) haml_lint hcaptcha (~> 7.0) httparty From cffb9621940b9c3535c4be8855dae0a97285ba5a Mon Sep 17 00:00:00 2001 From: Georg Gadinger Date: Tue, 25 Oct 2022 19:35:53 +0200 Subject: [PATCH 15/26] fix parent_layout for HAML 6 --- app/helpers/layouts_helper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/helpers/layouts_helper.rb b/app/helpers/layouts_helper.rb index cc924fae..e9025c2b 100644 --- a/app/helpers/layouts_helper.rb +++ b/app/helpers/layouts_helper.rb @@ -4,7 +4,6 @@ module LayoutsHelper def parent_layout(layout) @view_flow.set(:layout, output_buffer) output = render(template: "layouts/#{layout}") - @haml_buffer.buffer.replace output self.output_buffer = ActionView::OutputBuffer.new(output) end end From caf73558d62835969fae2d38a926925970b103e2 Mon Sep 17 00:00:00 2001 From: Georg Gadinger Date: Tue, 25 Oct 2022 20:05:54 +0200 Subject: [PATCH 16/26] views: rename .haml to .html.haml --- app/views/about/{about.haml => about.html.haml} | 0 app/views/about/{index.haml => index.html.haml} | 0 app/views/about/{privacy_policy.haml => privacy_policy.html.haml} | 0 app/views/about/{terms.haml => terms.html.haml} | 0 app/views/actions/{_answer.haml => _answer.html.haml} | 0 app/views/actions/{_comment.haml => _comment.html.haml} | 0 app/views/actions/{_question.haml => _question.html.haml} | 0 app/views/actions/{_share.haml => _share.html.haml} | 0 app/views/announcement/{edit.haml => edit.html.haml} | 0 app/views/announcement/{index.haml => index.html.haml} | 0 app/views/announcement/{new.haml => new.html.haml} | 0 app/views/answer/{show.haml => show.html.haml} | 0 app/views/answerbox/{_actions.haml => _actions.html.haml} | 0 app/views/answerbox/{_comments.haml => _comments.html.haml} | 0 app/views/answerbox/{_header.haml => _header.html.haml} | 0 app/views/answerbox/{_smiles.haml => _smiles.html.haml} | 0 app/views/application/{_answerbox.haml => _answerbox.html.haml} | 0 .../application/{_questionbox.haml => _questionbox.html.haml} | 0 ...or_authentication.haml => two_factor_authentication.html.haml} | 0 app/views/devise/confirmations/{new.haml => new.html.haml} | 0 ...tion_instructions.haml => confirmation_instructions.html.haml} | 0 ...rd_instructions.haml => reset_password_instructions.html.haml} | 0 .../{unlock_instructions.haml => unlock_instructions.html.haml} | 0 app/views/devise/passwords/{edit.haml => edit.html.haml} | 0 app/views/devise/passwords/{new.haml => new.html.haml} | 0 app/views/devise/registrations/{edit.haml => edit.html.haml} | 0 app/views/devise/registrations/{new.haml => new.html.haml} | 0 app/views/devise/sessions/{new.haml => new.html.haml} | 0 app/views/devise/shared/{_links.haml => _links.html.haml} | 0 app/views/devise/unlocks/{new.haml => new.html.haml} | 0 app/views/discover/{_userbox.haml => _userbox.html.haml} | 0 app/views/discover/{index.haml => index.html.haml} | 0 app/views/discover/tab/{_answers.haml => _answers.html.haml} | 0 app/views/discover/tab/{_asked.haml => _asked.html.haml} | 0 app/views/discover/tab/{_discussed.haml => _discussed.html.haml} | 0 app/views/discover/tab/{_most.haml => _most.html.haml} | 0 app/views/discover/tab/{_new.haml => _new.html.haml} | 0 app/views/discover/tab/{_questions.haml => _questions.html.haml} | 0 app/views/feedback/{bugs.haml => bugs.html.haml} | 0 app/views/feedback/{consent.haml => consent.html.haml} | 0 app/views/feedback/{features.haml => features.html.haml} | 0 app/views/inbox/{_actions.haml => _actions.html.haml} | 0 app/views/inbox/{_entry.haml => _entry.html.haml} | 0 app/views/inbox/{show.haml => show.html.haml} | 0 app/views/layouts/{_messages.haml => _messages.html.haml} | 0 app/views/layouts/{application.haml => application.html.haml} | 0 app/views/layouts/{base.haml => base.html.haml} | 0 app/views/layouts/{feed.haml => feed.html.haml} | 0 app/views/layouts/{feedback.haml => feedback.html.haml} | 0 app/views/layouts/{inbox.haml => inbox.html.haml} | 0 app/views/layouts/{mail.haml => mail.html.haml} | 0 app/views/layouts/moderation/{reports.haml => reports.html.haml} | 0 app/views/layouts/{notifications.haml => notifications.html.haml} | 0 app/views/layouts/user/{profile.haml => profile.html.haml} | 0 app/views/layouts/user/{settings.haml => settings.html.haml} | 0 app/views/link_filter/{index.haml => index.html.haml} | 0 app/views/modal/{_ask.haml => _ask.html.haml} | 0 app/views/modal/{_ban.haml => _ban.html.haml} | 0 .../modal/{_comment_smiles.haml => _comment_smiles.html.haml} | 0 app/views/modal/{_list.haml => _list.html.haml} | 0 app/views/modal/{_password.haml => _password.html.haml} | 0 app/views/modal/{_privileges.haml => _privileges.html.haml} | 0 app/views/modal/ban/{_controls.haml => _controls.html.haml} | 0 app/views/modal/ban/{_history.haml => _history.html.haml} | 0 app/views/modal/ban/{_unban.haml => _unban.html.haml} | 0 app/views/modal/list/{_item.haml => _item.html.haml} | 0 app/views/modal/privileges/{_item.haml => _item.html.haml} | 0 .../moderation/{_moderationbox.haml => _moderationbox.html.haml} | 0 .../moderation/anonymous_block/{index.haml => index.html.haml} | 0 app/views/moderation/inbox/{_header.haml => _header.html.haml} | 0 app/views/moderation/inbox/{index.haml => index.html.haml} | 0 .../moderation/questions/{_header.haml => _header.html.haml} | 0 app/views/moderation/questions/{show.haml => show.html.haml} | 0 app/views/moderation/reports/{index.haml => index.html.haml} | 0 app/views/navigation/{_desktop.haml => _desktop.html.haml} | 0 app/views/navigation/{_guest.haml => _guest.html.haml} | 0 app/views/navigation/{_main.haml => _main.html.haml} | 0 app/views/navigation/{_mobile.haml => _mobile.html.haml} | 0 .../dropdown/{_notifications.haml => _notifications.html.haml} | 0 .../navigation/dropdown/{_profile.haml => _profile.html.haml} | 0 app/views/notifications/{index.haml => index.html.haml} | 0 app/views/notifications/type/{_answer.haml => _answer.html.haml} | 0 .../notifications/type/{_comment.haml => _comment.html.haml} | 0 app/views/notifications/type/{_follow.haml => _follow.html.haml} | 0 .../notifications/type/{_reaction.haml => _reaction.html.haml} | 0 app/views/question/{_question.haml => _question.html.haml} | 0 app/views/question/{show.haml => show.html.haml} | 0 app/views/services/{index.haml => index.html.haml} | 0 app/views/settings/{_account.haml => _account.html.haml} | 0 app/views/settings/{_services.haml => _services.html.haml} | 0 app/views/settings/blocks/{index.haml => index.html.haml} | 0 app/views/settings/data/{index.haml => index.html.haml} | 0 app/views/settings/export/{index.haml => index.html.haml} | 0 app/views/settings/mutes/{index.haml => index.html.haml} | 0 app/views/settings/privacy/{edit.haml => edit.html.haml} | 0 app/views/settings/profile/{edit.haml => edit.html.haml} | 0 app/views/settings/theme/{edit.haml => edit.html.haml} | 0 .../{_totp_enabled.haml => _totp_enabled.html.haml} | 0 .../{_totp_setup.haml => _totp_setup.html.haml} | 0 .../shared/{_announcements.haml => _announcements.html.haml} | 0 .../shared/{_anonymous_block.haml => _anonymous_block.html.haml} | 0 app/views/shared/{_links.haml => _links.html.haml} | 0 app/views/shared/{_locales.haml => _locales.html.haml} | 0 app/views/shared/{_question.haml => _question.html.haml} | 0 app/views/shared/{_userbox.haml => _userbox.html.haml} | 0 app/views/tabs/{_feed.haml => _feed.html.haml} | 0 app/views/tabs/{_moderation.haml => _moderation.html.haml} | 0 app/views/tabs/{_notifications.haml => _notifications.html.haml} | 0 app/views/tabs/{_profile.haml => _profile.html.haml} | 0 app/views/tabs/{_settings.haml => _settings.html.haml} | 0 app/views/timeline/{timeline.haml => timeline.html.haml} | 0 app/views/user/{_actions.haml => _actions.html.haml} | 0 app/views/user/{_profile.haml => _profile.html.haml} | 0 app/views/user/{questions.haml => questions.html.haml} | 0 app/views/user/{show.haml => show.html.haml} | 0 app/views/user/{show_follow.haml => show_follow.html.haml} | 0 116 files changed, 0 insertions(+), 0 deletions(-) rename app/views/about/{about.haml => about.html.haml} (100%) rename app/views/about/{index.haml => index.html.haml} (100%) rename app/views/about/{privacy_policy.haml => privacy_policy.html.haml} (100%) rename app/views/about/{terms.haml => terms.html.haml} (100%) rename app/views/actions/{_answer.haml => _answer.html.haml} (100%) rename app/views/actions/{_comment.haml => _comment.html.haml} (100%) rename app/views/actions/{_question.haml => _question.html.haml} (100%) rename app/views/actions/{_share.haml => _share.html.haml} (100%) rename app/views/announcement/{edit.haml => edit.html.haml} (100%) rename app/views/announcement/{index.haml => index.html.haml} (100%) rename app/views/announcement/{new.haml => new.html.haml} (100%) rename app/views/answer/{show.haml => show.html.haml} (100%) rename app/views/answerbox/{_actions.haml => _actions.html.haml} (100%) rename app/views/answerbox/{_comments.haml => _comments.html.haml} (100%) rename app/views/answerbox/{_header.haml => _header.html.haml} (100%) rename app/views/answerbox/{_smiles.haml => _smiles.html.haml} (100%) rename app/views/application/{_answerbox.haml => _answerbox.html.haml} (100%) rename app/views/application/{_questionbox.haml => _questionbox.html.haml} (100%) rename app/views/auth/{two_factor_authentication.haml => two_factor_authentication.html.haml} (100%) rename app/views/devise/confirmations/{new.haml => new.html.haml} (100%) rename app/views/devise/mailer/{confirmation_instructions.haml => confirmation_instructions.html.haml} (100%) rename app/views/devise/mailer/{reset_password_instructions.haml => reset_password_instructions.html.haml} (100%) rename app/views/devise/mailer/{unlock_instructions.haml => unlock_instructions.html.haml} (100%) rename app/views/devise/passwords/{edit.haml => edit.html.haml} (100%) rename app/views/devise/passwords/{new.haml => new.html.haml} (100%) rename app/views/devise/registrations/{edit.haml => edit.html.haml} (100%) rename app/views/devise/registrations/{new.haml => new.html.haml} (100%) rename app/views/devise/sessions/{new.haml => new.html.haml} (100%) rename app/views/devise/shared/{_links.haml => _links.html.haml} (100%) rename app/views/devise/unlocks/{new.haml => new.html.haml} (100%) rename app/views/discover/{_userbox.haml => _userbox.html.haml} (100%) rename app/views/discover/{index.haml => index.html.haml} (100%) rename app/views/discover/tab/{_answers.haml => _answers.html.haml} (100%) rename app/views/discover/tab/{_asked.haml => _asked.html.haml} (100%) rename app/views/discover/tab/{_discussed.haml => _discussed.html.haml} (100%) rename app/views/discover/tab/{_most.haml => _most.html.haml} (100%) rename app/views/discover/tab/{_new.haml => _new.html.haml} (100%) rename app/views/discover/tab/{_questions.haml => _questions.html.haml} (100%) rename app/views/feedback/{bugs.haml => bugs.html.haml} (100%) rename app/views/feedback/{consent.haml => consent.html.haml} (100%) rename app/views/feedback/{features.haml => features.html.haml} (100%) rename app/views/inbox/{_actions.haml => _actions.html.haml} (100%) rename app/views/inbox/{_entry.haml => _entry.html.haml} (100%) rename app/views/inbox/{show.haml => show.html.haml} (100%) rename app/views/layouts/{_messages.haml => _messages.html.haml} (100%) rename app/views/layouts/{application.haml => application.html.haml} (100%) rename app/views/layouts/{base.haml => base.html.haml} (100%) rename app/views/layouts/{feed.haml => feed.html.haml} (100%) rename app/views/layouts/{feedback.haml => feedback.html.haml} (100%) rename app/views/layouts/{inbox.haml => inbox.html.haml} (100%) rename app/views/layouts/{mail.haml => mail.html.haml} (100%) rename app/views/layouts/moderation/{reports.haml => reports.html.haml} (100%) rename app/views/layouts/{notifications.haml => notifications.html.haml} (100%) rename app/views/layouts/user/{profile.haml => profile.html.haml} (100%) rename app/views/layouts/user/{settings.haml => settings.html.haml} (100%) rename app/views/link_filter/{index.haml => index.html.haml} (100%) rename app/views/modal/{_ask.haml => _ask.html.haml} (100%) rename app/views/modal/{_ban.haml => _ban.html.haml} (100%) rename app/views/modal/{_comment_smiles.haml => _comment_smiles.html.haml} (100%) rename app/views/modal/{_list.haml => _list.html.haml} (100%) rename app/views/modal/{_password.haml => _password.html.haml} (100%) rename app/views/modal/{_privileges.haml => _privileges.html.haml} (100%) rename app/views/modal/ban/{_controls.haml => _controls.html.haml} (100%) rename app/views/modal/ban/{_history.haml => _history.html.haml} (100%) rename app/views/modal/ban/{_unban.haml => _unban.html.haml} (100%) rename app/views/modal/list/{_item.haml => _item.html.haml} (100%) rename app/views/modal/privileges/{_item.haml => _item.html.haml} (100%) rename app/views/moderation/{_moderationbox.haml => _moderationbox.html.haml} (100%) rename app/views/moderation/anonymous_block/{index.haml => index.html.haml} (100%) rename app/views/moderation/inbox/{_header.haml => _header.html.haml} (100%) rename app/views/moderation/inbox/{index.haml => index.html.haml} (100%) rename app/views/moderation/questions/{_header.haml => _header.html.haml} (100%) rename app/views/moderation/questions/{show.haml => show.html.haml} (100%) rename app/views/moderation/reports/{index.haml => index.html.haml} (100%) rename app/views/navigation/{_desktop.haml => _desktop.html.haml} (100%) rename app/views/navigation/{_guest.haml => _guest.html.haml} (100%) rename app/views/navigation/{_main.haml => _main.html.haml} (100%) rename app/views/navigation/{_mobile.haml => _mobile.html.haml} (100%) rename app/views/navigation/dropdown/{_notifications.haml => _notifications.html.haml} (100%) rename app/views/navigation/dropdown/{_profile.haml => _profile.html.haml} (100%) rename app/views/notifications/{index.haml => index.html.haml} (100%) rename app/views/notifications/type/{_answer.haml => _answer.html.haml} (100%) rename app/views/notifications/type/{_comment.haml => _comment.html.haml} (100%) rename app/views/notifications/type/{_follow.haml => _follow.html.haml} (100%) rename app/views/notifications/type/{_reaction.haml => _reaction.html.haml} (100%) rename app/views/question/{_question.haml => _question.html.haml} (100%) rename app/views/question/{show.haml => show.html.haml} (100%) rename app/views/services/{index.haml => index.html.haml} (100%) rename app/views/settings/{_account.haml => _account.html.haml} (100%) rename app/views/settings/{_services.haml => _services.html.haml} (100%) rename app/views/settings/blocks/{index.haml => index.html.haml} (100%) rename app/views/settings/data/{index.haml => index.html.haml} (100%) rename app/views/settings/export/{index.haml => index.html.haml} (100%) rename app/views/settings/mutes/{index.haml => index.html.haml} (100%) rename app/views/settings/privacy/{edit.haml => edit.html.haml} (100%) rename app/views/settings/profile/{edit.haml => edit.html.haml} (100%) rename app/views/settings/theme/{edit.haml => edit.html.haml} (100%) rename app/views/settings/two_factor_authentication/otp_authentication/{_totp_enabled.haml => _totp_enabled.html.haml} (100%) rename app/views/settings/two_factor_authentication/otp_authentication/{_totp_setup.haml => _totp_setup.html.haml} (100%) rename app/views/shared/{_announcements.haml => _announcements.html.haml} (100%) rename app/views/shared/{_anonymous_block.haml => _anonymous_block.html.haml} (100%) rename app/views/shared/{_links.haml => _links.html.haml} (100%) rename app/views/shared/{_locales.haml => _locales.html.haml} (100%) rename app/views/shared/{_question.haml => _question.html.haml} (100%) rename app/views/shared/{_userbox.haml => _userbox.html.haml} (100%) rename app/views/tabs/{_feed.haml => _feed.html.haml} (100%) rename app/views/tabs/{_moderation.haml => _moderation.html.haml} (100%) rename app/views/tabs/{_notifications.haml => _notifications.html.haml} (100%) rename app/views/tabs/{_profile.haml => _profile.html.haml} (100%) rename app/views/tabs/{_settings.haml => _settings.html.haml} (100%) rename app/views/timeline/{timeline.haml => timeline.html.haml} (100%) rename app/views/user/{_actions.haml => _actions.html.haml} (100%) rename app/views/user/{_profile.haml => _profile.html.haml} (100%) rename app/views/user/{questions.haml => questions.html.haml} (100%) rename app/views/user/{show.haml => show.html.haml} (100%) rename app/views/user/{show_follow.haml => show_follow.html.haml} (100%) diff --git a/app/views/about/about.haml b/app/views/about/about.html.haml similarity index 100% rename from app/views/about/about.haml rename to app/views/about/about.html.haml diff --git a/app/views/about/index.haml b/app/views/about/index.html.haml similarity index 100% rename from app/views/about/index.haml rename to app/views/about/index.html.haml diff --git a/app/views/about/privacy_policy.haml b/app/views/about/privacy_policy.html.haml similarity index 100% rename from app/views/about/privacy_policy.haml rename to app/views/about/privacy_policy.html.haml diff --git a/app/views/about/terms.haml b/app/views/about/terms.html.haml similarity index 100% rename from app/views/about/terms.haml rename to app/views/about/terms.html.haml diff --git a/app/views/actions/_answer.haml b/app/views/actions/_answer.html.haml similarity index 100% rename from app/views/actions/_answer.haml rename to app/views/actions/_answer.html.haml diff --git a/app/views/actions/_comment.haml b/app/views/actions/_comment.html.haml similarity index 100% rename from app/views/actions/_comment.haml rename to app/views/actions/_comment.html.haml diff --git a/app/views/actions/_question.haml b/app/views/actions/_question.html.haml similarity index 100% rename from app/views/actions/_question.haml rename to app/views/actions/_question.html.haml diff --git a/app/views/actions/_share.haml b/app/views/actions/_share.html.haml similarity index 100% rename from app/views/actions/_share.haml rename to app/views/actions/_share.html.haml diff --git a/app/views/announcement/edit.haml b/app/views/announcement/edit.html.haml similarity index 100% rename from app/views/announcement/edit.haml rename to app/views/announcement/edit.html.haml diff --git a/app/views/announcement/index.haml b/app/views/announcement/index.html.haml similarity index 100% rename from app/views/announcement/index.haml rename to app/views/announcement/index.html.haml diff --git a/app/views/announcement/new.haml b/app/views/announcement/new.html.haml similarity index 100% rename from app/views/announcement/new.haml rename to app/views/announcement/new.html.haml diff --git a/app/views/answer/show.haml b/app/views/answer/show.html.haml similarity index 100% rename from app/views/answer/show.haml rename to app/views/answer/show.html.haml diff --git a/app/views/answerbox/_actions.haml b/app/views/answerbox/_actions.html.haml similarity index 100% rename from app/views/answerbox/_actions.haml rename to app/views/answerbox/_actions.html.haml diff --git a/app/views/answerbox/_comments.haml b/app/views/answerbox/_comments.html.haml similarity index 100% rename from app/views/answerbox/_comments.haml rename to app/views/answerbox/_comments.html.haml diff --git a/app/views/answerbox/_header.haml b/app/views/answerbox/_header.html.haml similarity index 100% rename from app/views/answerbox/_header.haml rename to app/views/answerbox/_header.html.haml diff --git a/app/views/answerbox/_smiles.haml b/app/views/answerbox/_smiles.html.haml similarity index 100% rename from app/views/answerbox/_smiles.haml rename to app/views/answerbox/_smiles.html.haml diff --git a/app/views/application/_answerbox.haml b/app/views/application/_answerbox.html.haml similarity index 100% rename from app/views/application/_answerbox.haml rename to app/views/application/_answerbox.html.haml diff --git a/app/views/application/_questionbox.haml b/app/views/application/_questionbox.html.haml similarity index 100% rename from app/views/application/_questionbox.haml rename to app/views/application/_questionbox.html.haml diff --git a/app/views/auth/two_factor_authentication.haml b/app/views/auth/two_factor_authentication.html.haml similarity index 100% rename from app/views/auth/two_factor_authentication.haml rename to app/views/auth/two_factor_authentication.html.haml diff --git a/app/views/devise/confirmations/new.haml b/app/views/devise/confirmations/new.html.haml similarity index 100% rename from app/views/devise/confirmations/new.haml rename to app/views/devise/confirmations/new.html.haml diff --git a/app/views/devise/mailer/confirmation_instructions.haml b/app/views/devise/mailer/confirmation_instructions.html.haml similarity index 100% rename from app/views/devise/mailer/confirmation_instructions.haml rename to app/views/devise/mailer/confirmation_instructions.html.haml diff --git a/app/views/devise/mailer/reset_password_instructions.haml b/app/views/devise/mailer/reset_password_instructions.html.haml similarity index 100% rename from app/views/devise/mailer/reset_password_instructions.haml rename to app/views/devise/mailer/reset_password_instructions.html.haml diff --git a/app/views/devise/mailer/unlock_instructions.haml b/app/views/devise/mailer/unlock_instructions.html.haml similarity index 100% rename from app/views/devise/mailer/unlock_instructions.haml rename to app/views/devise/mailer/unlock_instructions.html.haml diff --git a/app/views/devise/passwords/edit.haml b/app/views/devise/passwords/edit.html.haml similarity index 100% rename from app/views/devise/passwords/edit.haml rename to app/views/devise/passwords/edit.html.haml diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.html.haml similarity index 100% rename from app/views/devise/passwords/new.haml rename to app/views/devise/passwords/new.html.haml diff --git a/app/views/devise/registrations/edit.haml b/app/views/devise/registrations/edit.html.haml similarity index 100% rename from app/views/devise/registrations/edit.haml rename to app/views/devise/registrations/edit.html.haml diff --git a/app/views/devise/registrations/new.haml b/app/views/devise/registrations/new.html.haml similarity index 100% rename from app/views/devise/registrations/new.haml rename to app/views/devise/registrations/new.html.haml diff --git a/app/views/devise/sessions/new.haml b/app/views/devise/sessions/new.html.haml similarity index 100% rename from app/views/devise/sessions/new.haml rename to app/views/devise/sessions/new.html.haml diff --git a/app/views/devise/shared/_links.haml b/app/views/devise/shared/_links.html.haml similarity index 100% rename from app/views/devise/shared/_links.haml rename to app/views/devise/shared/_links.html.haml diff --git a/app/views/devise/unlocks/new.haml b/app/views/devise/unlocks/new.html.haml similarity index 100% rename from app/views/devise/unlocks/new.haml rename to app/views/devise/unlocks/new.html.haml diff --git a/app/views/discover/_userbox.haml b/app/views/discover/_userbox.html.haml similarity index 100% rename from app/views/discover/_userbox.haml rename to app/views/discover/_userbox.html.haml diff --git a/app/views/discover/index.haml b/app/views/discover/index.html.haml similarity index 100% rename from app/views/discover/index.haml rename to app/views/discover/index.html.haml diff --git a/app/views/discover/tab/_answers.haml b/app/views/discover/tab/_answers.html.haml similarity index 100% rename from app/views/discover/tab/_answers.haml rename to app/views/discover/tab/_answers.html.haml diff --git a/app/views/discover/tab/_asked.haml b/app/views/discover/tab/_asked.html.haml similarity index 100% rename from app/views/discover/tab/_asked.haml rename to app/views/discover/tab/_asked.html.haml diff --git a/app/views/discover/tab/_discussed.haml b/app/views/discover/tab/_discussed.html.haml similarity index 100% rename from app/views/discover/tab/_discussed.haml rename to app/views/discover/tab/_discussed.html.haml diff --git a/app/views/discover/tab/_most.haml b/app/views/discover/tab/_most.html.haml similarity index 100% rename from app/views/discover/tab/_most.haml rename to app/views/discover/tab/_most.html.haml diff --git a/app/views/discover/tab/_new.haml b/app/views/discover/tab/_new.html.haml similarity index 100% rename from app/views/discover/tab/_new.haml rename to app/views/discover/tab/_new.html.haml diff --git a/app/views/discover/tab/_questions.haml b/app/views/discover/tab/_questions.html.haml similarity index 100% rename from app/views/discover/tab/_questions.haml rename to app/views/discover/tab/_questions.html.haml diff --git a/app/views/feedback/bugs.haml b/app/views/feedback/bugs.html.haml similarity index 100% rename from app/views/feedback/bugs.haml rename to app/views/feedback/bugs.html.haml diff --git a/app/views/feedback/consent.haml b/app/views/feedback/consent.html.haml similarity index 100% rename from app/views/feedback/consent.haml rename to app/views/feedback/consent.html.haml diff --git a/app/views/feedback/features.haml b/app/views/feedback/features.html.haml similarity index 100% rename from app/views/feedback/features.haml rename to app/views/feedback/features.html.haml diff --git a/app/views/inbox/_actions.haml b/app/views/inbox/_actions.html.haml similarity index 100% rename from app/views/inbox/_actions.haml rename to app/views/inbox/_actions.html.haml diff --git a/app/views/inbox/_entry.haml b/app/views/inbox/_entry.html.haml similarity index 100% rename from app/views/inbox/_entry.haml rename to app/views/inbox/_entry.html.haml diff --git a/app/views/inbox/show.haml b/app/views/inbox/show.html.haml similarity index 100% rename from app/views/inbox/show.haml rename to app/views/inbox/show.html.haml diff --git a/app/views/layouts/_messages.haml b/app/views/layouts/_messages.html.haml similarity index 100% rename from app/views/layouts/_messages.haml rename to app/views/layouts/_messages.html.haml diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.html.haml similarity index 100% rename from app/views/layouts/application.haml rename to app/views/layouts/application.html.haml diff --git a/app/views/layouts/base.haml b/app/views/layouts/base.html.haml similarity index 100% rename from app/views/layouts/base.haml rename to app/views/layouts/base.html.haml diff --git a/app/views/layouts/feed.haml b/app/views/layouts/feed.html.haml similarity index 100% rename from app/views/layouts/feed.haml rename to app/views/layouts/feed.html.haml diff --git a/app/views/layouts/feedback.haml b/app/views/layouts/feedback.html.haml similarity index 100% rename from app/views/layouts/feedback.haml rename to app/views/layouts/feedback.html.haml diff --git a/app/views/layouts/inbox.haml b/app/views/layouts/inbox.html.haml similarity index 100% rename from app/views/layouts/inbox.haml rename to app/views/layouts/inbox.html.haml diff --git a/app/views/layouts/mail.haml b/app/views/layouts/mail.html.haml similarity index 100% rename from app/views/layouts/mail.haml rename to app/views/layouts/mail.html.haml diff --git a/app/views/layouts/moderation/reports.haml b/app/views/layouts/moderation/reports.html.haml similarity index 100% rename from app/views/layouts/moderation/reports.haml rename to app/views/layouts/moderation/reports.html.haml diff --git a/app/views/layouts/notifications.haml b/app/views/layouts/notifications.html.haml similarity index 100% rename from app/views/layouts/notifications.haml rename to app/views/layouts/notifications.html.haml diff --git a/app/views/layouts/user/profile.haml b/app/views/layouts/user/profile.html.haml similarity index 100% rename from app/views/layouts/user/profile.haml rename to app/views/layouts/user/profile.html.haml diff --git a/app/views/layouts/user/settings.haml b/app/views/layouts/user/settings.html.haml similarity index 100% rename from app/views/layouts/user/settings.haml rename to app/views/layouts/user/settings.html.haml diff --git a/app/views/link_filter/index.haml b/app/views/link_filter/index.html.haml similarity index 100% rename from app/views/link_filter/index.haml rename to app/views/link_filter/index.html.haml diff --git a/app/views/modal/_ask.haml b/app/views/modal/_ask.html.haml similarity index 100% rename from app/views/modal/_ask.haml rename to app/views/modal/_ask.html.haml diff --git a/app/views/modal/_ban.haml b/app/views/modal/_ban.html.haml similarity index 100% rename from app/views/modal/_ban.haml rename to app/views/modal/_ban.html.haml diff --git a/app/views/modal/_comment_smiles.haml b/app/views/modal/_comment_smiles.html.haml similarity index 100% rename from app/views/modal/_comment_smiles.haml rename to app/views/modal/_comment_smiles.html.haml diff --git a/app/views/modal/_list.haml b/app/views/modal/_list.html.haml similarity index 100% rename from app/views/modal/_list.haml rename to app/views/modal/_list.html.haml diff --git a/app/views/modal/_password.haml b/app/views/modal/_password.html.haml similarity index 100% rename from app/views/modal/_password.haml rename to app/views/modal/_password.html.haml diff --git a/app/views/modal/_privileges.haml b/app/views/modal/_privileges.html.haml similarity index 100% rename from app/views/modal/_privileges.haml rename to app/views/modal/_privileges.html.haml diff --git a/app/views/modal/ban/_controls.haml b/app/views/modal/ban/_controls.html.haml similarity index 100% rename from app/views/modal/ban/_controls.haml rename to app/views/modal/ban/_controls.html.haml diff --git a/app/views/modal/ban/_history.haml b/app/views/modal/ban/_history.html.haml similarity index 100% rename from app/views/modal/ban/_history.haml rename to app/views/modal/ban/_history.html.haml diff --git a/app/views/modal/ban/_unban.haml b/app/views/modal/ban/_unban.html.haml similarity index 100% rename from app/views/modal/ban/_unban.haml rename to app/views/modal/ban/_unban.html.haml diff --git a/app/views/modal/list/_item.haml b/app/views/modal/list/_item.html.haml similarity index 100% rename from app/views/modal/list/_item.haml rename to app/views/modal/list/_item.html.haml diff --git a/app/views/modal/privileges/_item.haml b/app/views/modal/privileges/_item.html.haml similarity index 100% rename from app/views/modal/privileges/_item.haml rename to app/views/modal/privileges/_item.html.haml diff --git a/app/views/moderation/_moderationbox.haml b/app/views/moderation/_moderationbox.html.haml similarity index 100% rename from app/views/moderation/_moderationbox.haml rename to app/views/moderation/_moderationbox.html.haml diff --git a/app/views/moderation/anonymous_block/index.haml b/app/views/moderation/anonymous_block/index.html.haml similarity index 100% rename from app/views/moderation/anonymous_block/index.haml rename to app/views/moderation/anonymous_block/index.html.haml diff --git a/app/views/moderation/inbox/_header.haml b/app/views/moderation/inbox/_header.html.haml similarity index 100% rename from app/views/moderation/inbox/_header.haml rename to app/views/moderation/inbox/_header.html.haml diff --git a/app/views/moderation/inbox/index.haml b/app/views/moderation/inbox/index.html.haml similarity index 100% rename from app/views/moderation/inbox/index.haml rename to app/views/moderation/inbox/index.html.haml diff --git a/app/views/moderation/questions/_header.haml b/app/views/moderation/questions/_header.html.haml similarity index 100% rename from app/views/moderation/questions/_header.haml rename to app/views/moderation/questions/_header.html.haml diff --git a/app/views/moderation/questions/show.haml b/app/views/moderation/questions/show.html.haml similarity index 100% rename from app/views/moderation/questions/show.haml rename to app/views/moderation/questions/show.html.haml diff --git a/app/views/moderation/reports/index.haml b/app/views/moderation/reports/index.html.haml similarity index 100% rename from app/views/moderation/reports/index.haml rename to app/views/moderation/reports/index.html.haml diff --git a/app/views/navigation/_desktop.haml b/app/views/navigation/_desktop.html.haml similarity index 100% rename from app/views/navigation/_desktop.haml rename to app/views/navigation/_desktop.html.haml diff --git a/app/views/navigation/_guest.haml b/app/views/navigation/_guest.html.haml similarity index 100% rename from app/views/navigation/_guest.haml rename to app/views/navigation/_guest.html.haml diff --git a/app/views/navigation/_main.haml b/app/views/navigation/_main.html.haml similarity index 100% rename from app/views/navigation/_main.haml rename to app/views/navigation/_main.html.haml diff --git a/app/views/navigation/_mobile.haml b/app/views/navigation/_mobile.html.haml similarity index 100% rename from app/views/navigation/_mobile.haml rename to app/views/navigation/_mobile.html.haml diff --git a/app/views/navigation/dropdown/_notifications.haml b/app/views/navigation/dropdown/_notifications.html.haml similarity index 100% rename from app/views/navigation/dropdown/_notifications.haml rename to app/views/navigation/dropdown/_notifications.html.haml diff --git a/app/views/navigation/dropdown/_profile.haml b/app/views/navigation/dropdown/_profile.html.haml similarity index 100% rename from app/views/navigation/dropdown/_profile.haml rename to app/views/navigation/dropdown/_profile.html.haml diff --git a/app/views/notifications/index.haml b/app/views/notifications/index.html.haml similarity index 100% rename from app/views/notifications/index.haml rename to app/views/notifications/index.html.haml diff --git a/app/views/notifications/type/_answer.haml b/app/views/notifications/type/_answer.html.haml similarity index 100% rename from app/views/notifications/type/_answer.haml rename to app/views/notifications/type/_answer.html.haml diff --git a/app/views/notifications/type/_comment.haml b/app/views/notifications/type/_comment.html.haml similarity index 100% rename from app/views/notifications/type/_comment.haml rename to app/views/notifications/type/_comment.html.haml diff --git a/app/views/notifications/type/_follow.haml b/app/views/notifications/type/_follow.html.haml similarity index 100% rename from app/views/notifications/type/_follow.haml rename to app/views/notifications/type/_follow.html.haml diff --git a/app/views/notifications/type/_reaction.haml b/app/views/notifications/type/_reaction.html.haml similarity index 100% rename from app/views/notifications/type/_reaction.haml rename to app/views/notifications/type/_reaction.html.haml diff --git a/app/views/question/_question.haml b/app/views/question/_question.html.haml similarity index 100% rename from app/views/question/_question.haml rename to app/views/question/_question.html.haml diff --git a/app/views/question/show.haml b/app/views/question/show.html.haml similarity index 100% rename from app/views/question/show.haml rename to app/views/question/show.html.haml diff --git a/app/views/services/index.haml b/app/views/services/index.html.haml similarity index 100% rename from app/views/services/index.haml rename to app/views/services/index.html.haml diff --git a/app/views/settings/_account.haml b/app/views/settings/_account.html.haml similarity index 100% rename from app/views/settings/_account.haml rename to app/views/settings/_account.html.haml diff --git a/app/views/settings/_services.haml b/app/views/settings/_services.html.haml similarity index 100% rename from app/views/settings/_services.haml rename to app/views/settings/_services.html.haml diff --git a/app/views/settings/blocks/index.haml b/app/views/settings/blocks/index.html.haml similarity index 100% rename from app/views/settings/blocks/index.haml rename to app/views/settings/blocks/index.html.haml diff --git a/app/views/settings/data/index.haml b/app/views/settings/data/index.html.haml similarity index 100% rename from app/views/settings/data/index.haml rename to app/views/settings/data/index.html.haml diff --git a/app/views/settings/export/index.haml b/app/views/settings/export/index.html.haml similarity index 100% rename from app/views/settings/export/index.haml rename to app/views/settings/export/index.html.haml diff --git a/app/views/settings/mutes/index.haml b/app/views/settings/mutes/index.html.haml similarity index 100% rename from app/views/settings/mutes/index.haml rename to app/views/settings/mutes/index.html.haml diff --git a/app/views/settings/privacy/edit.haml b/app/views/settings/privacy/edit.html.haml similarity index 100% rename from app/views/settings/privacy/edit.haml rename to app/views/settings/privacy/edit.html.haml diff --git a/app/views/settings/profile/edit.haml b/app/views/settings/profile/edit.html.haml similarity index 100% rename from app/views/settings/profile/edit.haml rename to app/views/settings/profile/edit.html.haml diff --git a/app/views/settings/theme/edit.haml b/app/views/settings/theme/edit.html.haml similarity index 100% rename from app/views/settings/theme/edit.haml rename to app/views/settings/theme/edit.html.haml diff --git a/app/views/settings/two_factor_authentication/otp_authentication/_totp_enabled.haml b/app/views/settings/two_factor_authentication/otp_authentication/_totp_enabled.html.haml similarity index 100% rename from app/views/settings/two_factor_authentication/otp_authentication/_totp_enabled.haml rename to app/views/settings/two_factor_authentication/otp_authentication/_totp_enabled.html.haml diff --git a/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.haml b/app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml similarity index 100% rename from app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.haml rename to app/views/settings/two_factor_authentication/otp_authentication/_totp_setup.html.haml diff --git a/app/views/shared/_announcements.haml b/app/views/shared/_announcements.html.haml similarity index 100% rename from app/views/shared/_announcements.haml rename to app/views/shared/_announcements.html.haml diff --git a/app/views/shared/_anonymous_block.haml b/app/views/shared/_anonymous_block.html.haml similarity index 100% rename from app/views/shared/_anonymous_block.haml rename to app/views/shared/_anonymous_block.html.haml diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.html.haml similarity index 100% rename from app/views/shared/_links.haml rename to app/views/shared/_links.html.haml diff --git a/app/views/shared/_locales.haml b/app/views/shared/_locales.html.haml similarity index 100% rename from app/views/shared/_locales.haml rename to app/views/shared/_locales.html.haml diff --git a/app/views/shared/_question.haml b/app/views/shared/_question.html.haml similarity index 100% rename from app/views/shared/_question.haml rename to app/views/shared/_question.html.haml diff --git a/app/views/shared/_userbox.haml b/app/views/shared/_userbox.html.haml similarity index 100% rename from app/views/shared/_userbox.haml rename to app/views/shared/_userbox.html.haml diff --git a/app/views/tabs/_feed.haml b/app/views/tabs/_feed.html.haml similarity index 100% rename from app/views/tabs/_feed.haml rename to app/views/tabs/_feed.html.haml diff --git a/app/views/tabs/_moderation.haml b/app/views/tabs/_moderation.html.haml similarity index 100% rename from app/views/tabs/_moderation.haml rename to app/views/tabs/_moderation.html.haml diff --git a/app/views/tabs/_notifications.haml b/app/views/tabs/_notifications.html.haml similarity index 100% rename from app/views/tabs/_notifications.haml rename to app/views/tabs/_notifications.html.haml diff --git a/app/views/tabs/_profile.haml b/app/views/tabs/_profile.html.haml similarity index 100% rename from app/views/tabs/_profile.haml rename to app/views/tabs/_profile.html.haml diff --git a/app/views/tabs/_settings.haml b/app/views/tabs/_settings.html.haml similarity index 100% rename from app/views/tabs/_settings.haml rename to app/views/tabs/_settings.html.haml diff --git a/app/views/timeline/timeline.haml b/app/views/timeline/timeline.html.haml similarity index 100% rename from app/views/timeline/timeline.haml rename to app/views/timeline/timeline.html.haml diff --git a/app/views/user/_actions.haml b/app/views/user/_actions.html.haml similarity index 100% rename from app/views/user/_actions.haml rename to app/views/user/_actions.html.haml diff --git a/app/views/user/_profile.haml b/app/views/user/_profile.html.haml similarity index 100% rename from app/views/user/_profile.haml rename to app/views/user/_profile.html.haml diff --git a/app/views/user/questions.haml b/app/views/user/questions.html.haml similarity index 100% rename from app/views/user/questions.haml rename to app/views/user/questions.html.haml diff --git a/app/views/user/show.haml b/app/views/user/show.html.haml similarity index 100% rename from app/views/user/show.haml rename to app/views/user/show.html.haml diff --git a/app/views/user/show_follow.haml b/app/views/user/show_follow.html.haml similarity index 100% rename from app/views/user/show_follow.haml rename to app/views/user/show_follow.html.haml From 3062741487c9b6015e189b3ea18b6bd84c1f693c Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Tue, 25 Oct 2022 21:11:17 +0200 Subject: [PATCH 17/26] Bump version to 2022.1025.0 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index c50766e9..93a94ea1 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -17,7 +17,7 @@ module Retrospring def month = 10 - def day = 12 + def day = 25 def patch = 0 From 16ac195ab9354ac273d321f8cad7149b79f7acf1 Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Tue, 25 Oct 2022 21:52:58 +0200 Subject: [PATCH 18/26] Center-align load more buttons on single column pages --- app/views/inbox/show.html.haml | 2 +- app/views/moderation/inbox/index.html.haml | 2 +- app/views/timeline/timeline.html.haml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index 0203e123..432ec743 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -6,6 +6,6 @@ = t(".empty") - if @more_data_available - .d-flex.justify-content-center.justify-content-sm-start#paginator + .d-flex.justify-content-center#paginator = button_to inbox_path(last_id: @inbox_last_id), class: "btn btn-light" do = t("voc.load") diff --git a/app/views/moderation/inbox/index.html.haml b/app/views/moderation/inbox/index.html.haml index fda0021e..50beb23d 100644 --- a/app/views/moderation/inbox/index.html.haml +++ b/app/views/moderation/inbox/index.html.haml @@ -9,6 +9,6 @@ = render "inbox/entry", i: i - if @more_data_available - .d-flex.justify-content-center.justify-content-sm-start#paginator + .d-flex.justify-content-center#paginator = button_to mod_inbox_index_path(@user, last_id: @inbox_last_id), class: "btn btn-light" do = t("voc.load") diff --git a/app/views/timeline/timeline.html.haml b/app/views/timeline/timeline.html.haml index e7eb7916..e767ea01 100644 --- a/app/views/timeline/timeline.html.haml +++ b/app/views/timeline/timeline.html.haml @@ -3,7 +3,7 @@ = render "answerbox", a: answer - if @more_data_available - .d-flex.justify-content-center.justify-content-sm-start#paginator + .d-flex.justify-content-center#paginator = button_to "#{request.path}?last_id=#{@timeline_last_id}", class: "btn btn-light" do = t("voc.load") From 9e52d5b623517cb754ce781fe44ff65d6974360b Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Wed, 26 Oct 2022 10:57:55 +0200 Subject: [PATCH 19/26] Use Lexend 300 as 400 --- app/javascript/styles/_variables.scss | 2 +- app/javascript/styles/application.scss | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/javascript/styles/_variables.scss b/app/javascript/styles/_variables.scss index 1f784d56..afc864c4 100644 --- a/app/javascript/styles/_variables.scss +++ b/app/javascript/styles/_variables.scss @@ -1,6 +1,6 @@ // Font settings $lexend-font-path: "~@fontsource/lexend/files"; -$lexend-weights: 400, 500, 600; +$lexend-weights: 500, 600; $fa-font-path: "~font-awesome/fonts"; $font-family-sans-serif: "Lexend", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index 57944071..b5765b62 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -32,6 +32,19 @@ ); } +// Using Lexend Light (300) as Regular (400) as Regular is quite thick. +@each $subset, $unicodeRangeValues in Lexend.$unicodeMap { + @font-face { + font-family: Lexend; + font-style: normal; + font-display: swap; + font-weight: 400; + src: url("#{Lexend.$fontDir}/lexend-#{$subset}-300-normal.woff2") format("woff2"), + url("#{Lexend.$fontDir}/lexend-all-300-normal.woff") format("woff"); + unicode-range: $unicodeRangeValues; + } +} + /** OVERRIDES ---------------------------------------------- From f9f49198fafb3920818ec117025d827428398c2c Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Wed, 26 Oct 2022 11:29:58 +0200 Subject: [PATCH 20/26] Prevent error when commenting via an answer page --- app/javascript/retrospring/features/answerbox/comment/new.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/javascript/retrospring/features/answerbox/comment/new.ts b/app/javascript/retrospring/features/answerbox/comment/new.ts index e97c497b..48e6ee21 100644 --- a/app/javascript/retrospring/features/answerbox/comment/new.ts +++ b/app/javascript/retrospring/features/answerbox/comment/new.ts @@ -38,7 +38,10 @@ export function commentCreateHandler(event: KeyboardEvent): boolean { if (data.success) { document.querySelector(`#ab-comments-${id}`).innerHTML = data.render; - document.querySelector(`#ab-comment-count-${id}`).innerHTML = data.count; + const commentCount = document.getElementById(`#ab-comment-count-${id}`); + if (commentCount) { + commentCount.innerHTML = data.count; + } input.value = ''; counter.innerHTML = String(160); From 29608c54c991c9becae1d92f0244af0cab1b718a Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Wed, 26 Oct 2022 11:32:39 +0200 Subject: [PATCH 21/26] Fix missing unsubscribe string in answer actions when posting a comment --- app/javascript/retrospring/features/answerbox/comment/new.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/retrospring/features/answerbox/comment/new.ts b/app/javascript/retrospring/features/answerbox/comment/new.ts index e97c497b..f9548680 100644 --- a/app/javascript/retrospring/features/answerbox/comment/new.ts +++ b/app/javascript/retrospring/features/answerbox/comment/new.ts @@ -44,7 +44,7 @@ export function commentCreateHandler(event: KeyboardEvent): boolean { const sub = document.querySelector(`[data-action=ab-submarine][data-a-id="${id}"]`); sub.dataset.torpedo = "no" - sub.children[0].nextSibling.textContent = ' ' + I18n.translate('views.actions.unsubscribe'); + sub.children[0].nextSibling.textContent = ' ' + I18n.translate('voc.unsubscribe'); } showNotification(data.message, data.success); From 7ee0aff7d965b4fa3d5aed9471e0438fdc3fe43a Mon Sep 17 00:00:00 2001 From: Karina Kwiatek Date: Wed, 26 Oct 2022 11:37:53 +0200 Subject: [PATCH 22/26] Bump version to 2022.1026.0 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index 93a94ea1..63563f47 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -17,7 +17,7 @@ module Retrospring def month = 10 - def day = 25 + def day = 26 def patch = 0 From 4567e25d9899d7ca61589bcbfc4d8223c7de3763 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:01:07 +0000 Subject: [PATCH 23/26] Bump rubocop-rails from 2.17.0 to 2.17.2 Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.17.0 to 2.17.2. - [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.17.0...v2.17.2) --- updated-dependencies: - dependency-name: rubocop-rails 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 cd5ebf12..64b5dd33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -456,7 +456,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.23.0) parser (>= 3.1.1.0) - rubocop-rails (2.17.0) + rubocop-rails (2.17.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) From 46311f1f331c75589b331ea4fe53b7989f755e59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:01:23 +0000 Subject: [PATCH 24/26] Bump rspec-mocks from 3.11.1 to 3.12.0 Bumps [rspec-mocks](https://github.com/rspec/rspec-mocks) from 3.11.1 to 3.12.0. - [Release notes](https://github.com/rspec/rspec-mocks/releases) - [Changelog](https://github.com/rspec/rspec-mocks/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-mocks/compare/v3.11.1...v3.12.0) --- updated-dependencies: - dependency-name: rspec-mocks dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index cd5ebf12..86000521 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,17 +421,17 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.1) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.12.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.11.1) + rspec-mocks (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.12.0) rspec-rails (6.0.1) actionpack (>= 6.1) activesupport (>= 6.1) @@ -443,7 +443,7 @@ GEM rspec-sidekiq (3.1.0) rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) - rspec-support (3.11.1) + rspec-support (3.12.0) rubocop (1.37.1) json (~> 2.3) parallel (~> 1.10) From 338be09f0289f125e4015b03b325e3f60af61bae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:01:35 +0000 Subject: [PATCH 25/26] Bump haml from 6.0.7 to 6.0.8 Bumps [haml](https://github.com/haml/haml) from 6.0.7 to 6.0.8. - [Release notes](https://github.com/haml/haml/releases) - [Changelog](https://github.com/haml/haml/blob/main/CHANGELOG.md) - [Commits](https://github.com/haml/haml/compare/v6.0.7...v6.0.8) --- updated-dependencies: - dependency-name: haml 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 cd5ebf12..019b11f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM guard (>= 2.0.0) guard-compat (~> 1.0) guard-compat (1.2.1) - haml (6.0.7) + haml (6.0.8) temple (>= 0.8.2) thor tilt From 923b4a8e7687d8fbf84ecf433be46422d2b4112c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:01:51 +0000 Subject: [PATCH 26/26] Bump net-smtp from 0.3.2 to 0.3.3 Bumps [net-smtp](https://github.com/ruby/net-smtp) from 0.3.2 to 0.3.3. - [Release notes](https://github.com/ruby/net-smtp/releases) - [Changelog](https://github.com/ruby/net-smtp/blob/master/NEWS.md) - [Commits](https://github.com/ruby/net-smtp/compare/v0.3.2...v0.3.3) --- updated-dependencies: - dependency-name: net-smtp 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 cd5ebf12..58dbdaa1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,7 +312,7 @@ GEM net-protocol net-protocol (0.1.3) timeout - net-smtp (0.3.2) + net-smtp (0.3.3) net-protocol nio4r (2.5.8) nokogiri (1.13.9)