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

Release 2025-01-22 (2) #10142

Merged
merged 3 commits into from
Jan 22, 2025
Merged
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
10 changes: 1 addition & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,7 @@ jobs:
environment:
RAILS_ENV: development
steps:
# GHSA-xc9x-jj77-9p9j
# Solutions: upgrade Nokogiri (requires newer Ruby) or
# Compile and link Nokogiri against new libxml2
# https://github.com/sparklemotion/nokogiri/security/advisories/GHSA-xc9x-jj77-9p9j
#
# CVE-2023-51774
# It has been fixed by upgrading to json-jwt to 1.16.6, but the CVE data has not
# been updated yet. So we can safely ignore it.
- run: bundle exec bundle-audit check --update --ignore GHSA-xc9x-jj77-9p9j CVE-2023-51774
- run: bundle exec bundle-audit check --update

back-license-check:
resource_class: small
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# 1. replacing $$ with $
# 2. replacing variables in ${} with some values, so `-u ${CIRCLE_CI_TOKEN}:` becomes `-u XXX:`

# in a makefile, "release_pr" is called a target
release_pr:
@./scripts/create_release_pr.sh

Expand Down
12 changes: 6 additions & 6 deletions back/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1031,17 +1031,17 @@ GEM
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-core (3.13.2)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-html-matchers (0.10.0)
nokogiri (~> 1)
rspec (>= 3.0.0.a)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-its (2.0.0)
rspec-core (>= 3.13.0)
rspec-expectations (>= 3.13.0)
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
Expand All @@ -1067,7 +1067,7 @@ GEM
rspec-sqlimit (0.0.6)
activerecord (>= 4.2.0, < 8)
rspec (~> 3.0)
rspec-support (3.13.1)
rspec-support (3.13.2)
rspec_api_documentation (6.1.0)
activesupport (>= 3.0.0)
mustache (~> 1.0, >= 0.99.4)
Expand Down
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/ideation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@

its(:additional_export_columns) { is_expected.to eq %w[manual_votes] }
its(:allowed_ideas_orders) { is_expected.to eq %w[trending random popular -new new comments_count] }
its(:proposed_budget_in_form?) { is_expected.to be true }
its(:return_disabled_actions?) { is_expected.to be false }
its(:supports_assignment?) { is_expected.to be true }
its(:supports_built_in_fields?) { is_expected.to be true }
Expand All @@ -229,4 +228,10 @@
its(:use_reactions_as_votes?) { is_expected.to be false }
its(:transitive?) { is_expected.to be true }
its(:supports_private_attributes_in_export?) { is_expected.to be true }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be true' do
expect(participation_method.send(:proposed_budget_in_form?)).to be true
end
end
end
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/information_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@

its(:additional_export_columns) { is_expected.to eq [] }
its(:allowed_ideas_orders) { is_expected.to be_empty }
its(:proposed_budget_in_form?) { is_expected.to be false }
its(:return_disabled_actions?) { is_expected.to be false }
its(:supports_assignment?) { is_expected.to be false }
its(:supports_built_in_fields?) { is_expected.to be false }
Expand All @@ -108,4 +107,10 @@
its(:transitive?) { is_expected.to be false }
its(:use_reactions_as_votes?) { is_expected.to be false }
its(:supports_private_attributes_in_export?) { is_expected.to be false }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be false' do
expect(participation_method.send(:proposed_budget_in_form?)).to be false
end
end
end
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/native_survey_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@

its(:additional_export_columns) { is_expected.to eq [] }
its(:allowed_ideas_orders) { is_expected.to be_empty }
its(:proposed_budget_in_form?) { is_expected.to be false }
its(:return_disabled_actions?) { is_expected.to be true }
its(:supports_assignment?) { is_expected.to be false }
its(:supports_built_in_fields?) { is_expected.to be false }
Expand All @@ -189,4 +188,10 @@
its(:supports_toxicity_detection?) { is_expected.to be false }
its(:use_reactions_as_votes?) { is_expected.to be false }
its(:transitive?) { is_expected.to be false }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be false' do
expect(participation_method.send(:proposed_budget_in_form?)).to be false
end
end
end
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/none_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@

its(:additional_export_columns) { is_expected.to eq [] }
its(:allowed_ideas_orders) { is_expected.to be_empty }
its(:proposed_budget_in_form?) { is_expected.to be false }
its(:return_disabled_actions?) { is_expected.to be false }
its(:supports_assignment?) { is_expected.to be false }
its(:supports_built_in_fields?) { is_expected.to be false }
Expand All @@ -91,4 +90,10 @@
its(:use_reactions_as_votes?) { is_expected.to be false }
its(:transitive?) { is_expected.to be false }
its(:supports_private_attributes_in_export?) { is_expected.to be false }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be false' do
expect(participation_method.send(:proposed_budget_in_form?)).to be false
end
end
end
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/poll_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@

its(:additional_export_columns) { is_expected.to eq [] }
its(:allowed_ideas_orders) { is_expected.to be_empty }
its(:proposed_budget_in_form?) { is_expected.to be false }
its(:return_disabled_actions?) { is_expected.to be false }
its(:supports_assignment?) { is_expected.to be false }
its(:supports_built_in_fields?) { is_expected.to be false }
Expand All @@ -107,4 +106,10 @@
its(:use_reactions_as_votes?) { is_expected.to be false }
its(:transitive?) { is_expected.to be false }
its(:supports_private_attributes_in_export?) { is_expected.to be false }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be false' do
expect(participation_method.send(:proposed_budget_in_form?)).to be false
end
end
end
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/proposals_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@

its(:additional_export_columns) { is_expected.to eq %w[manual_votes] }
its(:allowed_ideas_orders) { is_expected.to eq %w[trending random popular -new new comments_count] }
its(:proposed_budget_in_form?) { is_expected.to be false }
its(:return_disabled_actions?) { is_expected.to be false }
its(:supports_assignment?) { is_expected.to be true }
its(:supports_built_in_fields?) { is_expected.to be true }
Expand All @@ -236,4 +235,10 @@
its(:use_reactions_as_votes?) { is_expected.to be true }
its(:transitive?) { is_expected.to be false }
its(:supports_private_attributes_in_export?) { is_expected.to be true }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be false' do
expect(participation_method.send(:proposed_budget_in_form?)).to be false
end
end
end
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/survey_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@

its(:additional_export_columns) { is_expected.to eq [] }
its(:allowed_ideas_orders) { is_expected.to be_empty }
its(:proposed_budget_in_form?) { is_expected.to be false }
its(:return_disabled_actions?) { is_expected.to be false }
its(:supports_assignment?) { is_expected.to be false }
its(:supports_built_in_fields?) { is_expected.to be false }
Expand All @@ -108,4 +107,10 @@
its(:use_reactions_as_votes?) { is_expected.to be false }
its(:transitive?) { is_expected.to be false }
its(:supports_private_attributes_in_export?) { is_expected.to be false }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be false' do
expect(participation_method.send(:proposed_budget_in_form?)).to be false
end
end
end
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/volunteering_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@

its(:additional_export_columns) { is_expected.to eq [] }
its(:allowed_ideas_orders) { is_expected.to be_empty }
its(:proposed_budget_in_form?) { is_expected.to be false }
its(:return_disabled_actions?) { is_expected.to be false }
its(:supports_assignment?) { is_expected.to be false }
its(:supports_built_in_fields?) { is_expected.to be false }
Expand All @@ -107,4 +106,10 @@
its(:use_reactions_as_votes?) { is_expected.to be false }
its(:transitive?) { is_expected.to be false }
its(:supports_private_attributes_in_export?) { is_expected.to be false }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be false' do
expect(participation_method.send(:proposed_budget_in_form?)).to be false
end
end
end
7 changes: 6 additions & 1 deletion back/spec/lib/participation_method/voting_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
end

its(:allowed_ideas_orders) { is_expected.to eq ['random'] }
its(:proposed_budget_in_form?) { is_expected.to be true }
its(:return_disabled_actions?) { is_expected.to be false }
its(:supports_assignment?) { is_expected.to be true }
its(:supports_built_in_fields?) { is_expected.to be true }
Expand All @@ -185,4 +184,10 @@
its(:use_reactions_as_votes?) { is_expected.to be false }
its(:transitive?) { is_expected.to be true }
its(:supports_private_attributes_in_export?) { is_expected.to be true }

describe 'proposed_budget_in_form?' do # private method
it 'is expected to be true' do
expect(participation_method.send(:proposed_budget_in_form?)).to be true
end
end
end
Loading