Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build(deps): Bump jquery-rails from 4.5.1 to 4.6.0 #125

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
28 changes: 15 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion locale/app.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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, <strong>come back here</strong>, <a href=\"{{url}}\">reload this page</a> and file your new request."
msgid "When you're done, <strong>come back here</strong>, <a href=\"{{url}}\">reload this page</a> and send your new request."
msgstr ""

msgid "Which of these is happening?"
Expand Down