Bump to rc2 version

decidim · Feb 2, 2022 · 571f903 · 571f903
1 parent b50c1f6
commit 571f903
Show file tree

Hide file tree

Showing 48 changed files with 400 additions and 364 deletions.
diff --git a/.decidim-version b/.decidim-version
@@ -1 +1 @@
-0.26.0.rc1
+0.26.0.rc2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,38 @@
 
 ## [Unreleased](https://github.com/decidim/decidim/tree/HEAD)
 
+## [0.26.0.rc2](https://github.com/decidim/decidim/tree/v0.26.0.rc2)
+
+### Added
+
+Nothing.
+
+### Changed
+
+Nothing.
+
+### Fixed
+
+- **decidim-meetings**: Backport "Fix for preview unpublished meetings by admin user" to v0.26 [\#8724](https://github.com/decidim/decidim/pull/8724)
+- **decidim-comments**: Backport "Adds emojis when user edits a comment" to v0.26 [\#8743](https://github.com/decidim/decidim/pull/8743)
+- **decidim-core**: Backport "Properly mark sender and recipient in Conversation" to v0.26 [\#8746](https://github.com/decidim/decidim/pull/8746)
+- **decidim-participatory processes**: Backport "Fix order by weight in processes groups' processes content block" to v0.26 [\#8771](https://github.com/decidim/decidim/pull/8771)
+- **decidim-core**: Backport "Don't display blocked users in mentions" to v0.26 [\#8770](https://github.com/decidim/decidim/pull/8770)
+
+### Removed
+
+Nothing.
+
+### Internal
+
+- Backport "Revert the i18n-tasks initialization syntax" to v0.26 [\#8696](https://github.com/decidim/decidim/pull/8696)
+- Backport "Lock graphql version to 1.12 minor" to v0.26 [\#8695](https://github.com/decidim/decidim/pull/8695)
+- Disable codeclimate's stylelint [\#8711](https://github.com/decidim/decidim/pull/8711)
+
+### Developer improvements
+
+- Backport "Fix webpacker generator for modules" to v0.26 [\#8750](https://github.com/decidim/decidim/pull/8750)
+
 ## [0.26.0.rc1](https://github.com/decidim/decidim/tree/v0.26.0.rc1)
 
 ### Migration notes

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -11,62 +11,62 @@ GIT
 PATH
   remote: .
   specs:
-    decidim (0.26.0.rc1)
-      decidim-accountability (= 0.26.0.rc1)
-      decidim-admin (= 0.26.0.rc1)
-      decidim-api (= 0.26.0.rc1)
-      decidim-assemblies (= 0.26.0.rc1)
-      decidim-blogs (= 0.26.0.rc1)
-      decidim-budgets (= 0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-      decidim-debates (= 0.26.0.rc1)
-      decidim-forms (= 0.26.0.rc1)
-      decidim-generators (= 0.26.0.rc1)
-      decidim-meetings (= 0.26.0.rc1)
-      decidim-pages (= 0.26.0.rc1)
-      decidim-participatory_processes (= 0.26.0.rc1)
-      decidim-proposals (= 0.26.0.rc1)
-      decidim-sortitions (= 0.26.0.rc1)
-      decidim-surveys (= 0.26.0.rc1)
-      decidim-system (= 0.26.0.rc1)
-      decidim-templates (= 0.26.0.rc1)
-      decidim-verifications (= 0.26.0.rc1)
-    decidim-accountability (0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-admin (0.26.0.rc1)
+    decidim (0.26.0.rc2)
+      decidim-accountability (= 0.26.0.rc2)
+      decidim-admin (= 0.26.0.rc2)
+      decidim-api (= 0.26.0.rc2)
+      decidim-assemblies (= 0.26.0.rc2)
+      decidim-blogs (= 0.26.0.rc2)
+      decidim-budgets (= 0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+      decidim-debates (= 0.26.0.rc2)
+      decidim-forms (= 0.26.0.rc2)
+      decidim-generators (= 0.26.0.rc2)
+      decidim-meetings (= 0.26.0.rc2)
+      decidim-pages (= 0.26.0.rc2)
+      decidim-participatory_processes (= 0.26.0.rc2)
+      decidim-proposals (= 0.26.0.rc2)
+      decidim-sortitions (= 0.26.0.rc2)
+      decidim-surveys (= 0.26.0.rc2)
+      decidim-system (= 0.26.0.rc2)
+      decidim-templates (= 0.26.0.rc2)
+      decidim-verifications (= 0.26.0.rc2)
+    decidim-accountability (0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-admin (0.26.0.rc2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.0.rc1)
+      decidim-core (= 0.26.0.rc2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0)
-    decidim-api (0.26.0.rc1)
+    decidim-api (0.26.0.rc2)
       graphql (~> 1.12, < 1.13)
       rack-cors (~> 1.0)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-assemblies (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-blogs (0.26.0.rc1)
-      decidim-admin (= 0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-budgets (0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-comments (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
+    decidim-assemblies (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-blogs (0.26.0.rc2)
+      decidim-admin (= 0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-budgets (0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-comments (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-conferences (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-      decidim-meetings (= 0.26.0.rc1)
+    decidim-conferences (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+      decidim-meetings (= 0.26.0.rc2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-consultations (0.26.0.rc1)
-      decidim-admin (= 0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-core (0.26.0.rc1)
+    decidim-consultations (0.26.0.rc2)
+      decidim-admin (= 0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-core (0.26.0.rc2)
       active_link_to (~> 1.0)
       acts_as_list (~> 0.9)
       batch-loader (~> 1.2)
@@ -76,7 +76,7 @@ PATH
       cells-rails (~> 0.1.3)
       charlock_holmes (~> 0.7)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.26.0.rc1)
+      decidim-api (= 0.26.0.rc2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       diffy (~> 3.3)
@@ -118,15 +118,15 @@ PATH
       valid_email2 (~> 2.1)
       webpacker (= 6.0.0.rc.5)
       wisper (~> 2.0)
-    decidim-debates (0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-dev (0.26.0.rc1)
+    decidim-debates (0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-dev (0.26.0.rc2)
       axe-core-rspec (~> 4.1.0)
       byebug (~> 11.0)
       capybara (~> 3.24)
       db-query-matchers (~> 0.10.0)
-      decidim (= 0.26.0.rc1)
+      decidim (= 0.26.0.rc2)
       erb_lint (~> 0.0.35)
       factory_bot_rails (~> 4.8)
       i18n-tasks (~> 0.9.18)
@@ -149,63 +149,63 @@ PATH
       w3c_rspec_validators (~> 0.3.0)
       webmock (~> 3.6)
       wisper-rspec (~> 1.0)
-    decidim-elections (0.26.0.rc1)
+    decidim-elections (0.26.0.rc2)
       decidim-bulletin_board (= 0.22.3)
-      decidim-core (= 0.26.0.rc1)
-      decidim-forms (= 0.26.0.rc1)
-      decidim-proposals (= 0.26.0.rc1)
+      decidim-core (= 0.26.0.rc2)
+      decidim-forms (= 0.26.0.rc2)
+      decidim-proposals (= 0.26.0.rc2)
       rack-attack (~> 6.0)
       voting_schemes-dummy (= 0.22.3)
       voting_schemes-electionguard (= 0.22.3)
-    decidim-forms (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
+    decidim-forms (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-generators (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-initiatives (0.26.0.rc1)
-      decidim-admin (= 0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-      decidim-verifications (= 0.26.0.rc1)
+    decidim-generators (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-initiatives (0.26.0.rc2)
+      decidim-admin (= 0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+      decidim-verifications (= 0.26.0.rc2)
       origami (~> 2.1)
       virtus-multiparams (~> 0.1)
       wicked (~> 1.3)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-meetings (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-      decidim-forms (= 0.26.0.rc1)
+    decidim-meetings (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+      decidim-forms (= 0.26.0.rc2)
       icalendar (~> 2.5)
-    decidim-pages (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-participatory_processes (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-    decidim-proposals (0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
+    decidim-pages (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-participatory_processes (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+    decidim-proposals (0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
       doc2text (~> 0.4.4)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.26.0.rc1)
-      decidim-admin (= 0.26.0.rc1)
-      decidim-comments (= 0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-      decidim-proposals (= 0.26.0.rc1)
-    decidim-surveys (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-      decidim-forms (= 0.26.0.rc1)
-      decidim-templates (= 0.26.0.rc1)
-    decidim-system (0.26.0.rc1)
+    decidim-sortitions (0.26.0.rc2)
+      decidim-admin (= 0.26.0.rc2)
+      decidim-comments (= 0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+      decidim-proposals (= 0.26.0.rc2)
+    decidim-surveys (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+      decidim-forms (= 0.26.0.rc2)
+      decidim-templates (= 0.26.0.rc2)
+    decidim-system (0.26.0.rc2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.26.0.rc1)
+      decidim-core (= 0.26.0.rc2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0)
-    decidim-templates (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
-      decidim-forms (= 0.26.0.rc1)
-    decidim-verifications (0.26.0.rc1)
-      decidim-core (= 0.26.0.rc1)
+    decidim-templates (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
+      decidim-forms (= 0.26.0.rc2)
+    decidim-verifications (0.26.0.rc2)
+      decidim-core (= 0.26.0.rc2)
 
 GEM
   remote: https://rubygems.org/
@@ -330,7 +330,7 @@ GEM
       actionpack (>= 5.0)
       cells (>= 4.1.6, < 5.0.0)
     charlock_holmes (0.7.7)
-    chef-utils (17.9.26)
+    chef-utils (17.9.42)
       concurrent-ruby
     childprocess (3.0.0)
     coercible (1.0.0)
@@ -399,7 +399,7 @@ GEM
     erbse (0.1.4)
       temple
     erubi (1.10.0)
-    excon (0.89.0)
+    excon (0.90.0)
     execjs (2.8.1)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
@@ -442,10 +442,10 @@ GEM
       excon (~> 0.71)
       formatador (~> 0.2)
       mime-types
-    fog-local (0.7.0)
+    fog-local (0.8.0)
       fog-core (>= 1.27, < 3.0)
     formatador (0.3.0)
-    geocoder (1.7.2)
+    geocoder (1.7.3)
     globalid (0.5.2)
       activesupport (>= 5.0)
     graphlient (0.4.0)
@@ -579,7 +579,7 @@ GEM
     origami (2.1.0)
       colorize (~> 0.7)
     orm_adapter (0.5.0)
-    paper_trail (12.1.0)
+    paper_trail (12.2.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.20.1)
@@ -601,7 +601,7 @@ GEM
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
-    rack-attack (6.5.0)
+    rack-attack (6.6.0)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -662,7 +662,7 @@ GEM
     redcarpet (3.5.1)
     redis (4.5.1)
     regexp_parser (2.1.1)
-    request_store (1.5.0)
+    request_store (1.5.1)
       rack (>= 1.4)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -675,15 +675,15 @@ GEM
     rspec-cells (0.3.7)
       cells (>= 4.0.0, < 6.0.0)
       rspec-rails (< 6.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-html-matchers (0.9.4)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-rails (4.1.2)
@@ -723,7 +723,7 @@ GEM
     ruby-vips (2.1.4)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
-    rubyXL (3.4.18)
+    rubyXL (3.4.21)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)

diff --git a/bin/changelog_generator b/bin/changelog_generator
@@ -113,6 +113,10 @@ types = {
     label: "type: removal",
     skip_modules: false
   },
+  "Internal" => {
+    label: "type: internal",
+    skip_modules: true
+  },
   "Developer improvements" => {
     label: "target: developer-experience",
     skip_modules: true

diff --git a/decidim-accountability/lib/decidim/accountability/version.rb b/decidim-accountability/lib/decidim/accountability/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.26.0.rc1"
+      "0.26.0.rc2"
     end
   end
 end
diff --git a/decidim-admin/lib/decidim/admin/version.rb b/decidim-admin/lib/decidim/admin/version.rb
@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.26.0.rc1"
+      "0.26.0.rc2"
     end
   end
 end