From 32d9d7fcb369fab931672fe3b113e0b3e7a29bf2 Mon Sep 17 00:00:00 2001 From: Confirmordeny Date: Sun, 18 Jun 2023 09:28:06 +0100 Subject: [PATCH 1/2] Update app.pot "send" is clearer than "file". The term "file" could mean (a) submitting it to a public authority or (b) placing the request in a storage system. --- locale/app.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/app.pot b/locale/app.pot index d81fbc0cae..52bd0d54a5 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -3654,7 +3654,7 @@ msgstr "" msgid "When you want to change your account password, you will also need to enter your two factor one time passcode. Your one time passcode can only be used once, so a new one will be generated after you've successfully changed your password. You'll need to update your password manager or print the new passcode." msgstr "" -msgid "When you're done, come back here, reload this page and file your new request." +msgid "When you're done, come back here, reload this page and send your new request." msgstr "" msgid "Which of these is happening?" From ac527ec22b009e780154e7f712320d40369165b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 03:29:36 +0000 Subject: [PATCH 2/2] Build(deps): Bump jquery-rails from 4.5.1 to 4.6.0 Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.5.1 to 4.6.0. - [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/jquery-rails/compare/v4.5.1...v4.6.0) --- updated-dependencies: - dependency-name: jquery-rails dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 4f7a46777b..16039fba70 100644 --- a/Gemfile +++ b/Gemfile @@ -96,7 +96,7 @@ gem 'fancybox-rails', '~> 0.3.0' gem 'gnuplot', '~> 2.6.0' gem 'htmlentities', '~> 4.3.0' gem 'icalendar', '~> 2.8.0' -gem 'jquery-rails', '~> 4.5.1' +gem 'jquery-rails', '~> 4.6.0' gem 'jquery-ui-rails', '~> 6.0.0' gem 'json', '~> 2.6.2' gem 'holidays', '~> 8.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index b61e4f8c4a..e68b421915 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -270,7 +270,7 @@ GEM ice_cube (0.16.4) iso_country_codes (0.7.8) jmespath (1.6.2) - jquery-rails (4.5.1) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -286,9 +286,9 @@ GEM libv8-node (16.10.0.0-x86_64-darwin) libv8-node (16.10.0.0-x86_64-linux) locale (2.1.3) - loofah (2.19.1) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mahoro (0.5) mail (2.8.1) mini_mime (>= 0.1.1) @@ -303,10 +303,10 @@ GEM mime-types (2.99.3) mini_magick (4.12.0) mini_mime (1.1.2) - mini_portile2 (2.8.1) + mini_portile2 (2.8.2) mini_racer (0.6.3) libv8-node (~> 16.10.0.0) - minitest (5.18.0) + minitest (5.18.1) money (6.16.0) i18n (>= 0.6.4, <= 2) multi_json (1.15.0) @@ -355,7 +355,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.1) - racc (1.6.2) + racc (1.7.1) rack (2.2.6.4) rack-test (2.1.0) rack (>= 1.3) @@ -379,11 +379,13 @@ GEM actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails-i18n (7.0.5) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) @@ -496,7 +498,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.2.1) + thor (1.2.2) tilt (2.0.10) timeout (0.3.2) trailblazer-option (0.1.2) @@ -531,7 +533,7 @@ GEM rexml xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.7) + zeitwerk (2.6.8) zip_tricks (5.6.0) PLATFORMS @@ -572,7 +574,7 @@ DEPENDENCIES i18n (~> 1.12.0) icalendar (~> 2.8.0) iso_country_codes (~> 0.7.8) - jquery-rails (~> 4.5.1) + jquery-rails (~> 4.6.0) jquery-ui-rails (~> 6.0.0) json (~> 2.6.2) launchy (< 2.6.0)