Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	Gemfile.legacy.lock
#	Gemfile.lock
#	app/controllers/decidim/decidim_awesome/admin/admin_accountability_controller.rb
#	app/models/decidim/decidim_awesome/paper_trail_version.rb
#	app/packs/src/decidim/decidim_awesome/editors/editor.js
#	app/presenters/decidim/decidim_awesome/user_entity_presenter.rb
#	app/views/decidim/decidim_awesome/admin/admin_accountability/index.html.erb
#	config/locales/en.yml
#	lib/decidim/decidim_awesome/test/shared_examples/action_log_presenter_examples.rb
#	lib/decidim/decidim_awesome/version.rb
#	package-lock.json
#	package.json
#	spec/jobs/export_admin_actions_job_spec.rb
#	spec/models/paper_trail_version_spec.rb
#	spec/presenters/participatory_space_role_presenter_spec.rb
#	spec/presenters/user_entity_presenter_spec.rb
#	spec/system/admin/admin_accountability_admin_filtering_spec.rb
#	spec/system/admin/admin_accountability_ps_filtering_spec.rb
#	spec/system/admin/admin_accountability_spec.rb
  • Loading branch information
microstudi committed Oct 6, 2023
2 parents e09e87e + 25d2e7f commit 5a99411
Show file tree
Hide file tree
Showing 46 changed files with 2,678 additions and 3,754 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests-legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
NODE_VERSION: 16.9.1
RUBY_VERSION: 2.7.6
RUBY_VERSION: 2.7.7
BUNDLE_GEMFILE: Gemfile.legacy

jobs:
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
CHANGELOG
=========

v0.9.3
------

Compatibility:
- Decidim v0.27.3
- Decidim v0.26.7

Features:
- Fixes for admin accountability leaking other tenants data

v0.9.2
------

Compatibility:
- Decidim v0.27.3
- Decidim v0.26.7

Features:
- Fixes for the menu hacker

v0.9.1
------

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = "0.27.1"
DECIDIM_VERSION = "0.27.4"

gem "decidim", DECIDIM_VERSION
gem "decidim-decidim_awesome", path: "."
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.legacy
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

ruby RUBY_VERSION
DECIDIM_VERSION = "0.26.4"
DECIDIM_VERSION = "0.26.8"

gem "decidim", DECIDIM_VERSION
gem "decidim-decidim_awesome", path: "."
Expand Down
Loading

0 comments on commit 5a99411

Please sign in to comment.