Skip to content

bundle, yarn update and translation.io update for 4.0.1 release #3251

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.

Sign up for GitHub

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

Merged
pengyin-shan merged 2 commits into from
Nov 30, 2022
Merged

bundle, yarn update and translation.io update for 4.0.1 release #3251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6e68cc
bundle, yarn update and translation.io update
pengyin-shan Nov 30, 2022
a3b3a4c
fix rubocop
pengyin-shan Nov 30, 2022
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
59 changes: 30 additions & 29 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ GEM
activerecord (6.1.7)
activemodel (= 6.1.7)
activesupport (= 6.1.7)
activerecord_json_validator (2.1.1)
activerecord_json_validator (2.1.3)
activerecord (>= 4.2.0, < 8)
json_schemer (~> 0.2.18)
activestorage (6.1.7)
Expand Down Expand Up @@ -82,11 +82,11 @@ GEM
bindex (0.8.1)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bootsnap (1.13.0)
bootsnap (1.15.0)
msgpack (~> 1.2)
brakeman (5.3.1)
brakeman (5.4.0)
builder (3.2.4)
bullet (7.0.3)
bullet (7.0.4)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
bundle-audit (0.1.0)
Expand All @@ -95,7 +95,7 @@ GEM
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
byebug (11.1.3)
capybara (3.37.1)
capybara (3.38.0)
addressable
matrix
mini_mime (>= 0.1.3)
Expand All @@ -105,7 +105,7 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
capybara-webmock (0.1.0)
childprocess (3.0.0)
childprocess (4.1.0)
coderay (1.1.3)
concurrent-ruby (1.1.10)
contact_us (1.2.0)
Expand Down Expand Up @@ -144,19 +144,19 @@ GEM
ecma-re-validator (0.4.0)
regexp_parser (~> 2.2)
erubi (1.11.0)
excon (0.93.1)
excon (0.94.0)
execjs (2.8.1)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faker (2.23.0)
faker (3.0.0)
i18n (>= 1.8.11, < 2)
faraday (2.6.0)
faraday (2.7.1)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.1)
faraday-net_http (3.0.2)
ffi (1.15.5)
flag_shih_tzu (0.3.23)
fog-aws (3.15.0)
Expand Down Expand Up @@ -214,7 +214,7 @@ GEM
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
json (2.6.2)
json_schemer (0.2.21)
json_schemer (0.2.23)
ecma-re-validator (~> 0.3)
hana (~> 1.3)
regexp_parser (~> 2.0)
Expand Down Expand Up @@ -255,7 +255,8 @@ GEM
rake
mini_mime (1.1.2)
minitest (5.16.3)
mocha (1.16.0)
mocha (2.0.2)
ruby2_keywords (>= 0.0.5)
msgpack (1.6.0)
multi_json (1.15.0)
multi_xml (0.6.0)
Expand Down Expand Up @@ -294,9 +295,9 @@ GEM
options (2.3.2)
orm_adapter (0.5.0)
parallel (1.22.1)
parser (3.1.2.1)
parser (3.1.3.0)
ast (~> 2.4.1)
pg (1.4.4)
pg (1.4.5)
prime (0.1.2)
forwardable
singleton
Expand All @@ -311,13 +312,13 @@ GEM
nio4r (~> 2.0)
pundit (2.2.0)
activesupport (>= 3.0.0)
pundit-matchers (1.7.0)
pundit-matchers (1.8.4)
rspec-rails (>= 3.0.0)
racc (1.6.0)
rack (2.2.4)
rack-mini-profiler (3.0.0)
rack (>= 1.2.0)
rack-protection (3.0.2)
rack-protection (3.0.4)
rack
rack-proxy (0.7.4)
rack
Expand Down Expand Up @@ -360,22 +361,22 @@ GEM
ffi (~> 1.0)
recaptcha (5.12.3)
json
regexp_parser (2.6.0)
regexp_parser (2.6.1)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.5)
rollbar (3.3.2)
rspec-collection_matchers (1.2.0)
rspec-expectations (>= 2.99.0.beta1)
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-mocks (3.11.1)
rspec-support (~> 3.12.0)
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)
Expand All @@ -384,8 +385,8 @@ GEM
rspec-expectations (~> 3.11)
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
rspec-support (3.11.1)
rubocop (1.37.1)
rspec-support (3.12.0)
rubocop (1.39.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.1.2.1)
Expand Down Expand Up @@ -447,7 +448,7 @@ GEM
thor (1.2.1)
tilt (2.0.11)
tomparse (0.4.2)
translation (1.32)
translation (1.34)
gettext (~> 3.2, >= 3.2.5, <= 3.4.3)
turbo-rails (1.3.2)
actionpack (>= 6.0.0)
Expand Down Expand Up @@ -494,10 +495,10 @@ GEM
yard-tomdoc (0.7.1)
tomparse (>= 0.4.0)
yard
zeitwerk (2.6.1)
zeitwerk (2.6.6)

PLATFORMS
arm64-darwin-21
arm64-darwin-22
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -580,4 +581,4 @@ RUBY VERSION
ruby 2.7.6p219

BUNDLED WITH
2.3.24
2.3.25
4 changes: 2 additions & 2 deletions app/presenters/guidance_presenter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ def guidance_groups_by_theme(org: nil, question: nil)

return {} unless hashified_guidance_groups.key?(org)

hashified_guidance_groups[org].each_key.each_with_object({}) do |gg, acc|
filtered_gg = hashified_guidance_groups[org][gg].each_key.each_with_object({}) do |theme, ac|
hashified_guidance_groups[org].each_key.with_object({}) do |gg, acc|
filtered_gg = hashified_guidance_groups[org][gg].each_key.with_object({}) do |theme, ac|
next unless question.themes.include?(theme)

ac[theme] = hashified_guidance_groups[org][gg][theme]
Expand Down
Loading