From b3420f07e70ecea87da84a564b942fffcfde625a Mon Sep 17 00:00:00 2001 From: Eric Schubert Date: Wed, 6 May 2026 13:36:52 +0200 Subject: [PATCH] [#73440] change dependency of edit page permission - editing pages no longer needs the permission of viewing the history - viewing past edits now is its own permission, still depending on viewing the page itself --- config/initializers/permissions.rb | 2 +- .../wikis/db/migrate/20260422131715_update_wiki_permissions.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/permissions.rb b/config/initializers/permissions.rb index 708d57fb9ab..dd30f593c64 100644 --- a/config/initializers/permissions.rb +++ b/config/initializers/permissions.rb @@ -549,7 +549,7 @@ Rails.application.reloader.to_prepare do wiki.permission :edit_wiki_pages, { wiki: %i[edit update preview add_attachment new new_child create rename] }, - dependencies: :view_wiki_edits, + dependencies: :view_wiki_pages, permissible_on: :project wiki.permission :manage_wiki, diff --git a/modules/wikis/db/migrate/20260422131715_update_wiki_permissions.rb b/modules/wikis/db/migrate/20260422131715_update_wiki_permissions.rb index 7317c5c661d..63bb07f354e 100644 --- a/modules/wikis/db/migrate/20260422131715_update_wiki_permissions.rb +++ b/modules/wikis/db/migrate/20260422131715_update_wiki_permissions.rb @@ -45,7 +45,7 @@ class UpdateWikiPermissions < ActiveRecord::Migration[8.1] SQL ::Migration::MigrationUtils::PermissionAdder.add(:manage_wiki, :edit_wiki_pages) - ::Migration::MigrationUtils::PermissionAdder.add(:edit_wiki_pages, :view_wiki_edits) + ::Migration::MigrationUtils::PermissionAdder.add(:edit_wiki_pages, :view_wiki_pages) ::Migration::MigrationUtils::PermissionAdder.add(:view_wiki_edits, :view_wiki_pages) end end