diff --git a/.rubocop.yml b/.rubocop.yml index 98de4da116a2..532cc1173ae5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1213,6 +1213,7 @@ RSpec/DescribeClass: - spec/gemfiles_spec.rb - spec/js_bundles_spec.rb - spec/i18n_spec.rb + - "**/*/spec/**/*_badge_spec.rb" - decidim-core/spec/lib/global_engines_spec.rb - "**/tasks/**/*" diff --git a/CHANGELOG.md b/CHANGELOG.md index a12688c121f8..8f206dd660f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ **Added**: - **decidim-assemblies**: Add organizational chart to assemblies home. [\#4045](https://github.com/decidim/decidim/pull/4045) +- **decidim-core**: Adds the *followers* badge. [\#4089](https://github.com/decidim/decidim/pull/4089) +- **decidim-debates**: Adds the *commented debates* badge. [\#4089](https://github.com/decidim/decidim/pull/4089) - **decidim-meetings**: Add upcoming events content block and page. [\#3987](https://github.com/decidim/decidim/pull/3987) **Changed**: diff --git a/decidim-core/app/assets/images/decidim/gamification/badges/followers.svg b/decidim-core/app/assets/images/decidim/gamification/badges/followers.svg new file mode 100644 index 000000000000..8f9326dbecf7 --- /dev/null +++ b/decidim-core/app/assets/images/decidim/gamification/badges/followers.svg @@ -0,0 +1,115 @@ + diff --git a/decidim-core/app/cells/decidim/badge/show.erb b/decidim-core/app/cells/decidim/badge/show.erb index 77a588d66b05..2cdd027c1860 100644 --- a/decidim-core/app/cells/decidim/badge/show.erb +++ b/decidim-core/app/cells/decidim/badge/show.erb @@ -6,7 +6,7 @@