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

[pull] develop from decidim:develop #153

Merged
merged 82 commits into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
ff35564
Fix issues with unexpected date filter params for the process listing…
ahukkanen May 2, 2023
962db6f
Fix: Inconsistent datetime distance_in_words translations (#10810)
alecslupu May 3, 2023
3088dc5
Fix proposals' valuators assignments not deleted when space admin is …
alecslupu May 3, 2023
1eb6618
Fix initiative creation without fallback attribute (#10811)
alecslupu May 4, 2023
f1ae813
Change the participant initiatives editor toolbars type (#10820)
ahukkanen May 8, 2023
a0d5d39
Fix budget summary mail when a scope is defined and enabled (#10830)
ahukkanen May 10, 2023
05cb604
Refactor factories titles (#10044)
andreslucena May 11, 2023
cc5a035
Fix decidim-core system specs pipeline (#10835)
alecslupu May 11, 2023
d6d0ae1
Add binstub for bin/dev (#10853)
andreslucena May 15, 2023
e619a73
Refactor participatory space user roles (#10694)
alecslupu May 15, 2023
487b394
Fix the `spec/controllers` directory on budgets (#10856)
andreslucena May 15, 2023
5cc7373
Split Destroy Admin Tests (#10859)
alecslupu May 16, 2023
b562c92
Update gems to next available patch level (#10861)
alecslupu May 16, 2023
c1333b3
Fix webpack version to <5.83.0 (#10878)
fblupi May 17, 2023
43a7cd2
Change documentation to fix typo (#10866)
JoeMurray May 18, 2023
84be36f
Standardize initializer naming and add tests to ensure consistency (#…
ahukkanen May 18, 2023
c744b7e
Fix the active filter for process groups (#10829)
ahukkanen May 18, 2023
0e5566e
Add "Vulnerability disclosure policy" section to SECURITY file (#10879)
andreslucena May 20, 2023
6411388
Fix missing translations for SMS confirmation when signing a petition…
eliegaboriau May 23, 2023
5ba9efd
Disable poorly formatted requires (#10682)
alecslupu May 23, 2023
41c2441
Fix fetching apt packages (#10889)
andreslucena May 23, 2023
6834117
Add more disallowed prefixes in the 'Check PR title' workflow (#10893)
andreslucena May 23, 2023
48e6086
Update dev dependencies (#10867)
alecslupu May 24, 2023
5514b46
Add translation string for URL error message (#10855)
greenwoodt May 24, 2023
dbb7471
Fix partner type in Conferences' partners edit form (#10894)
greenwoodt May 24, 2023
e224ab3
Fix budgets zero single view (#10892)
greenwoodt May 24, 2023
43a2c9c
Fix Security policy file link (#10888)
andreslucena May 24, 2023
6de145f
Replace the WYSIWYG editor with TipTap (#10196)
ahukkanen May 25, 2023
176b98e
Ignore social share button links in external domain warning (#10121)
andreslucena May 25, 2023
0b22665
Component settings attribute type addition - "Float" (#10821)
JoonasAapro May 25, 2023
fd0e09e
Fix initialization of autoloaded constants (#10858)
alecslupu May 25, 2023
1436479
Update the setup-chromedriver GitHub action to v2 (#10907)
ahukkanen May 26, 2023
dd81412
Apply the same GitHub actions updates to the component template (#10908)
ahukkanen May 26, 2023
f761b11
Add translation to "Terms and condition" page title and body (#10823)
alecslupu May 26, 2023
8d8e9f3
Fix flaky tests at proposals (#10906)
ahukkanen May 26, 2023
fa5c525
Remove `db-query-matchers` gem (#10860)
alecslupu May 29, 2023
67c2631
Remove unused preset-env dependencies (#10916)
alecslupu May 29, 2023
a278051
Fix for initiative menu not active on creation (#10919)
andreslucena May 29, 2023
2712608
Correct directory of `TranslatablePresenceValidator` and `UrlValidato…
andreslucena May 29, 2023
5d9b042
Migrate to `GITHUB_OUTPUT` in components' template GitHub Actions (#1…
andreslucena May 29, 2023
1223543
Change plain states to Rails enum (#10239)
alecslupu May 29, 2023
d2e600e
Fix reminder already registered with the name :close_meeting (#10911)
alecslupu May 30, 2023
f5d09fe
Add seeded Trustees (#10901)
andreslucena May 30, 2023
fadc9e3
Show message on the Election form about the Organization time zone (#…
andreslucena May 30, 2023
b510d94
Remove unused factories (#10923)
alecslupu May 30, 2023
710777d
Enable new rubocop rules part 1 (#10924)
alecslupu May 30, 2023
c92e617
Fix RSpec/FactoryBot/ConsistentParenthesesStyle rubocop rule (#10929)
alecslupu May 30, 2023
9fbfe77
Enable new rubocop rules part 2 (#10930)
alecslupu May 30, 2023
8169381
Refactor intiative wizard (#10727)
alecslupu May 31, 2023
161c841
Change to display initiatives after creation (#10927)
greenwoodt May 31, 2023
8ef5559
Fix do not count blocked users to stats (#10693)
alecslupu May 31, 2023
a38b59b
Fix rubocop linting issue (#10935)
ahukkanen Jun 1, 2023
ee8c882
Add possibility of reporting blog posts (#10863)
eliegaboriau Jun 2, 2023
52af6b9
Fix flaky searching specs (#10909)
ahukkanen Jun 2, 2023
5a74ef7
Change the Elections' setup minimum hours before start setting to 1 h…
andreslucena Jun 2, 2023
add40b9
Allow to publish an Election even if it hasn't valid Questions (#10905)
andreslucena Jun 2, 2023
8ab6201
New Crowdin updates (#10774)
decidim-bot Jun 2, 2023
88790f9
Fix user and group related migrations calling the actual record class…
ahukkanen Jun 2, 2023
fa2605f
Allow custom session store and remove samesite protection config (#10…
ahukkanen Jun 2, 2023
22b40a8
Update stringio to 3.0.7 (#10945)
alecslupu Jun 2, 2023
4f3228c
Fix error message mismatch in election (#10946)
alecslupu Jun 5, 2023
20a6a49
Standardize the format of the words "I am" (#10949)
ahukkanen Jun 5, 2023
a50fa4d
Fix exception in Initiatives' Page (#10928)
andreslucena Jun 6, 2023
6209f88
Enable new rubocop rules part 3 (#10932)
alecslupu Jun 6, 2023
1078598
Don't allow access to admin panel without ToS acceptance (#10117)
andreslucena Jun 7, 2023
29e2db8
Fix flaky collaborative drafts spec (#10970)
ahukkanen Jun 8, 2023
37ebe1a
Don't ask for overwriting .ruby-version on app generation (#10972)
andreslucena Jun 8, 2023
103d2d3
Add "Security" procedure for Maintainers (#10969)
andreslucena Jun 8, 2023
21bf844
Make organizations' colors seeds random (#10974)
andreslucena Jun 9, 2023
3616672
Triadic color calculator for organization colors (#10977)
andreslucena Jun 13, 2023
e1a9d15
Load the editor assets only when there is an editor on the page (#10973)
ahukkanen Jun 13, 2023
dfef1c6
Add ESLint and Stylelint to component template (#10965)
ahukkanen Jun 13, 2023
e6d570d
Install the gems in the original env during generator specs (#10966)
ahukkanen Jun 13, 2023
2037eeb
Fix to Proposal cards CSS in Processes (#10914)
greenwoodt Jun 13, 2023
993025e
Fix "No activity" message in Last Activities isn't shown sometimes (#…
alecslupu Jun 14, 2023
d9b9854
Do not return the icon if it does not exist in the file system (#10988)
ahukkanen Jun 14, 2023
8b5fa7f
Bump doorkeeper from 5.5.4 to 5.6.6 (#11002)
alecslupu Jun 14, 2023
2678e74
Add a button to send a newsletter to the admin (#10896)
ElviaBth Jun 21, 2023
f1e1f96
Lock sass-embedded to 1.62 (#11074)
alecslupu Jun 21, 2023
3a1eaff
Avoid password change to be requested when user registration mode is …
apuertadelaguila Jun 21, 2023
c7db070
Replace `bootstrap-tagsinput` npm package with `tom-select` (#11076)
andreslucena Jun 22, 2023
2a12210
Add Content Security Policy support (#10700)
alecslupu Jun 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ plugins:
- decidim-core/app/assets/javascripts/decidim/core/bundle.js
- decidim-elections/lib/decidim/elections/jwk_utils.rb
- decidim-dev/config/rubocop/ruby.yml
- docs/modules/develop/pages/maintainers/security.adoc

grep:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/module-rspec/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ runs:
- run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
name: Create the screenshots folder
shell: "bash"
- uses: nanasess/setup-chromedriver@v1
- uses: nanasess/setup-chromedriver@v2
- run: RAILS_ENV=test bundle exec rails assets:precompile
name: Precompile assets
working-directory: ./spec/decidim_dummy_app/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_core_system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
node_version: ${{ env.NODE_VERSION }}
- run: |
sudo Xvfb -ac $DISPLAY -screen 0 1920x1084x24 > /dev/null 2>&1 & # optional
bundle exec rake parallel:spec[^spec/system]
bundle exec rspec spec/system
name: RSpec
working-directory: ${{ env.DECIDIM_MODULE }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_pr_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: deepakputhraya/action-pr-title@master
with:
disallowed_prefixes: "feat/,chore/,build/,ci/,refactor/,docs/,wip/"
disallowed_prefixes: "feat/,feature/,fix/,chore/,build/,ci/,refactor/,docs/,wip/,fix:"
prefix_case_sensitive: false
min_length: 5
max_length: 100
3 changes: 2 additions & 1 deletion .gitpod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ USER root

# Install PostgreSQL
ENV PGVERSION=14
RUN apt-get install -y postgresql postgresql-client postgresql-server-dev-${PGVERSION} libpq-dev
RUN apt-get update \
&& apt-get install -y postgresql postgresql-client postgresql-server-dev-${PGVERSION} libpq-dev

# Setup the database user env vars, drop the default database cluster and change the folders to the workspace
# This makes it possible to persist the database within the workspace
Expand Down
48 changes: 48 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,51 @@ Rails/Output:
Rails/Exit:
Exclude:
- lib/decidim/git_backport_manager.rb

RSpec/NoExpectationExample:
Exclude:
- decidim-admin/spec/system/participatory_space_private_user_spec.rb
- decidim-comments/spec/services/decidim/comments/comment_creation_spec.rb
- decidim-conferences/spec/cells/decidim/conferences/conference_speaker_cell_spec.rb
- decidim-core/spec/cells/decidim/date_range_cell_spec.rb
- decidim-core/spec/commands/decidim/unsubscribe_settings_spec.rb
- decidim-core/spec/controllers/registrations_controller_spec.rb
- decidim-core/spec/lib/importers/import_manifest_spec.rb
- decidim-core/spec/lib/map/geocoding_spec.rb
- decidim-core/spec/lib/participatory_space_manifest_spec.rb
- decidim-core/spec/services/decidim/events_manager_spec.rb
- decidim-core/spec/services/decidim/settings_change_spec.rb
- decidim-core/spec/services/decidim/zip_stream/zip_stream_writer_spec.rb
- decidim-core/spec/tasks/decidim_tasks_right_to_be_forgotten_spec.rb
- decidim-elections/spec/lib/tasks/decidim_election_generate_identification_keys_spec.rb
- decidim-elections/spec/lib/tasks/decidim_election_scheduled_tasks_spec.rb
- decidim-elections/spec/shared/vote_examples.rb
- decidim-elections/spec/system/key_ceremony_spec.rb
- decidim-elections/spec/system/vote_online_inside_a_voting_spec.rb
- decidim-initiatives/spec/system/admin/update_initiative_spec.rb
- decidim-initiatives/spec/system/initiative_signing_spec.rb
- decidim-meetings/spec/commands/admin/export_meeting_registrations_spec.rb
- decidim-proposals/spec/lib/decidim/proposals/markdown_to_proposals_spec.rb
- decidim-proposals/spec/shared/import_proposals_examples.rb
- decidim-proposals/spec/shared/proposals_wizards_examples.rb
- decidim-proposals/spec/system/admin/admin_manages_participatory_texts_spec.rb
- decidim-proposals/spec/system/participatory_texts_spec.rb
- decidim-participatory_processes/spec/system/participatory_processes_spec.rb

# fix these rules later
Capybara/SpecificFinders:
Enabled: false

Capybara/CurrentPathExpectation:
Enabled: false

RSpec/IndexedLet:
Enabled: false

RSpec/Rails/InferredSpecType:
Enabled: false

Rails/HelperInstanceVariable:
Enabled: false

# EOF fix these rules later
3 changes: 3 additions & 0 deletions .spelling.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
exclude_paths:
- \.(gem|jpg|jpeg|png|ico|pdf|odt|xlsx|jwk|pem)$
- config/locales/((?!en).)*\.yml
- decidim-dev/lib/decidim/dev/assets/participatory_text.md
- decidim-core/lib/decidim/db/common-passwords.txt
Expand Down Expand Up @@ -60,6 +61,8 @@ forbidden:
"you’ve": you have
"I've": I have
"I’ve": I have
"I'm": I am
"I’m": I am
"they've": they have
"they’ve": they have
"would've": would have
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Come find us at https://matrix.to/#/#decidim:matrix.org[our Matrix.org space]. W
== Did you find a bug?

* *Do not open up a GitHub issue if the bug is a security vulnerability in Decidim*, and instead send us an email to security [at] decidim.org.
See https://github.com/decidim/decidim/blob/develop/SECURITY.adoc[full security policy].
See https://github.com/decidim/decidim/blob/develop/SECURITY.md[full security policy].
* *Ensure the bug was not already reported* by searching on GitHub under https://github.com/decidim/decidim/issues[Issues] and on https://meta.decidim.org/processes/bug-report/f/210/proposals[Metadecidim].
* If you are unable to find an open issue addressing the problem, https://github.com/decidim/decidim/issues/new?template=Bug_report.md[open a new one on GitHub].
Be sure to include a *title and clear description*, as much relevant information as possible, and a *code sample* or an *executable test case* demonstrating the expected behavior that is not occurring.
Expand Down
6 changes: 2 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@ gem "bootsnap", "~> 1.4"

gem "puma", ">= 5.6.2"

gem "faker", "~> 2.14"

group :development, :test do
gem "byebug", "~> 11.0", platform: :mri

gem "decidim-dev", path: "."

gem "brakeman", "~> 5.2"
gem "brakeman", "~> 5.4"
gem "net-imap", "~> 0.2.3"
gem "net-pop", "~> 0.1.1"
gem "net-smtp", "~> 0.3.1"
gem "parallel_tests", "~> 3.7"
gem "parallel_tests", "~> 4.2"
end

group :development do
Expand Down
Loading