From 7e9ba2e7b558cc1ebc9e94f923b8678fb6e3b86f Mon Sep 17 00:00:00 2001 From: leaannbradford Date: Fri, 29 Sep 2023 09:31:24 -0700 Subject: [PATCH 1/4] User invite email has html tag Fixes #1998 --- config/locales/devise_invitable.de.yml | 2 +- config/locales/devise_invitable.en.yml | 2 +- config/locales/devise_invitable.es.yml | 2 +- config/locales/devise_invitable.fr.yml | 2 +- config/locales/devise_invitable.it.yml | 2 +- config/locales/devise_invitable.pt-BR.yml | 2 +- config/locales/devise_invitable.zh.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/locales/devise_invitable.de.yml b/config/locales/devise_invitable.de.yml index f12abbe25..611df91d6 100644 --- a/config/locales/devise_invitable.de.yml +++ b/config/locales/devise_invitable.de.yml @@ -22,7 +22,7 @@ de: accept_until: Diese Einladung wird in %{due_date} fällig. hello: Hallo %{email} ignore: |- - Wenn Sie die Einladung nicht akzeptieren möchten, ignorieren Sie bitte diese E-Mail.
+ Wenn Sie die Einladung nicht akzeptieren möchten, ignorieren Sie bitte diese E-Mail. Ihr Konto wird erst dann erstellt, wenn Sie auf den obigen Link zugreifen und Ihr Passwort festlegen. someone_invited_you: Jemand hat Sie zu %{url} eingeladen, können Sie es über den Link unten akzeptieren. subject: Einladungshinweise diff --git a/config/locales/devise_invitable.en.yml b/config/locales/devise_invitable.en.yml index b5431bed5..61260a473 100644 --- a/config/locales/devise_invitable.en.yml +++ b/config/locales/devise_invitable.en.yml @@ -22,7 +22,7 @@ en: accept_until: This invitation will be due in %{due_date}. hello: Hello %{email} ignore: |- - If you don't want to accept the invitation, please ignore this email.
+ If you don't want to accept the invitation, please ignore this email. Your account won't be created until you access the link above and set your password. someone_invited_you: Someone has invited you to %{url}, you can accept it through the link below. subject: Invitation instructions diff --git a/config/locales/devise_invitable.es.yml b/config/locales/devise_invitable.es.yml index 3b1932547..09afe524c 100644 --- a/config/locales/devise_invitable.es.yml +++ b/config/locales/devise_invitable.es.yml @@ -22,7 +22,7 @@ es: accept_until: Esta invitación será %{due_date}. hello: Hola %{email} ignore: |- - Si no desea aceptar la invitación, ignore este correo electrónico.
+ Si no desea aceptar la invitación, ignore este correo electrónico. Su cuenta no se creará hasta que acceda al enlace anterior y establezca su contraseña. someone_invited_you: Alguien te ha invitado a %{url}, puedes aceptarlo a través del siguiente enlace. subject: Instrucciones de invitación diff --git a/config/locales/devise_invitable.fr.yml b/config/locales/devise_invitable.fr.yml index abc2dc9d1..b326f15e0 100644 --- a/config/locales/devise_invitable.fr.yml +++ b/config/locales/devise_invitable.fr.yml @@ -22,7 +22,7 @@ fr: accept_until: Cette invitation sera due en %{due_date}. hello: Bonjour %{email} ignore: |- - Si vous ne souhaitez pas accepter l'invitation, ignorez ce courriel.
+ Si vous ne souhaitez pas accepter l'invitation, ignorez ce courriel. Votre compte ne sera créé que lorsque vous accédez au lien ci-dessus et définissez votre mot de passe. someone_invited_you: Quelqu'un vous a invité %{url}, vous pouvez l'accepter par le lien ci-dessous. subject: Instructions d'invitation diff --git a/config/locales/devise_invitable.it.yml b/config/locales/devise_invitable.it.yml index f3b7c8e5a..e6c3eda5c 100644 --- a/config/locales/devise_invitable.it.yml +++ b/config/locales/devise_invitable.it.yml @@ -22,7 +22,7 @@ it: accept_until: Questo invito sarà dovuto in %{due_date}. hello: Ciao %{email} ignore: |- - Se non desideri accettare l'invito, ignora questa email.
+ Se non desideri accettare l'invito, ignora questa email. Il tuo account non verrà creato finché non accedi al link precedente e imposta la tua password. someone_invited_you: Qualcuno ti ha invitato a %{url}, puoi accettarlo tramite il link qui sotto. subject: Istruzioni di invito diff --git a/config/locales/devise_invitable.pt-BR.yml b/config/locales/devise_invitable.pt-BR.yml index 419e4ddaa..0542788f4 100644 --- a/config/locales/devise_invitable.pt-BR.yml +++ b/config/locales/devise_invitable.pt-BR.yml @@ -22,7 +22,7 @@ pt-BR: accept_until: Este convite será devido em %{due_date}. hello: Olá %{email} ignore: |- - Se você não deseja aceitar o convite, ignore este e-mail.
+ Se você não deseja aceitar o convite, ignore este e-mail. Sua conta não será criada até você acessar o link acima e definir sua senha. someone_invited_you: Alguém convidou você para %{url}, você pode aceitá-lo através do link abaixo. subject: Instruções de convite diff --git a/config/locales/devise_invitable.zh.yml b/config/locales/devise_invitable.zh.yml index e7c6f246f..6eab58e6c 100644 --- a/config/locales/devise_invitable.zh.yml +++ b/config/locales/devise_invitable.zh.yml @@ -22,7 +22,7 @@ zh: accept_until: 此邀请将到期 %{due_date}. hello: 你好 %{email} ignore: |- - 如果您不想接受邀请，请忽略此电子邮件。
+ 如果您不想接受邀请，请忽略此电子邮件。 在您访问以上链接并设置密码之前，您的帐户将不会被创建。 someone_invited_you: 有人邀请你到 %{url}，您可以通过以下链接接受。 subject: 邀请说明 From 2ff77de8d76ab77670275d910177bab272d3fff6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 15:39:10 -0400 Subject: [PATCH 2/4] Bump semver from 7.3.8 to 7.5.4 (#1965) Bumps [semver](https://github.com/npm/node-semver) from 7.3.8 to 7.5.4. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.3.8...v7.5.4) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 21de4fefc..352521ecc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2333,9 +2333,9 @@ schema-utils@^3.0.0: ajv-keywords "^3.5.2" semver@^7.3.5: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== dependencies: lru-cache "^6.0.0" From 22bbbd007ee6c130e99ca6ef765b8aea6f40dcbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 15:39:19 -0400 Subject: [PATCH 3/4] Bump word-wrap from 1.2.3 to 1.2.4 (#1969) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 352521ecc..edf346052 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2858,9 +2858,9 @@ which@^2.0.1: isexe "^2.0.0" word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + version "1.2.4" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" + integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== worker-loader@^1.0.0: version "1.1.1" From 85b5250b13e24c0580ecdbd122b113d26002cc1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 15:42:11 -0400 Subject: [PATCH 4/4] Bump puma from 4.3.12 to 5.6.7 (#1978) Bumps [puma](https://github.com/puma/puma) from 4.3.12 to 5.6.7. - [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/v4.3.12...v5.6.7) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 868c97ba3..8973c5792 100644 --- a/Gemfile +++ b/Gemfile @@ -58,7 +58,7 @@ gem 'parser', '~> 2.5.3' gem 'pg' gem 'postrank-uri', '>= 1.0.24' gem 'pry-byebug', group: %i[development test] -gem 'puma', '~> 4.3' # Use Puma as the app server +gem 'puma', '~> 5.6' # Use Puma as the app server gem 'rack-test', '0.7.0', group: %i[test] # rack-test >= 0.71 does not work with older Capybara versions (< 2.17). See #214 for more details gem 'rails-controller-testing', group: %i[test] gem 'rdf', '~> 3.1.15' # rdf 3.2.0 removed SerializedTransaction which ldp requires diff --git a/Gemfile.lock b/Gemfile.lock index 4436734e8..597431283 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -893,7 +893,7 @@ GEM pry (>= 0.13, < 0.15) psych (3.3.4) public_suffix (4.0.7) - puma (4.3.12) + puma (5.6.7) nio4r (~> 2.0) qa (5.10.0) activerecord-import @@ -1342,7 +1342,7 @@ DEPENDENCIES pg postrank-uri (>= 1.0.24) pry-byebug - puma (~> 4.3) + puma (~> 5.6) rack-test (= 0.7.0) rails (~> 5.2.5) rails-controller-testing