Skip to content

Allow diffing changes in wiki history

Steve Mokris requested to merge (removed):15242-wiki-diff into master

What does this MR do?

Adds ability to diff changes to wiki pages.

Based on @gwhyte's work on gitlab-foss!5002 (closed). I rebased it, and updated some function calls that were renamed since the original MR was created a few years ago.

Screenshots

Restructured the Wiki "Page history" page, so the "Page version" column links to the revision (instead of showing a Git commit hash), and so the "Commit" column links to a new Changes page.

Screen_Shot_2020-05-14_at_20.48.10

The new Changes page:

Screen_Shot_2020-05-15_at_10.45.25

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Closes #15242 (closed)

Edited by 🤖 GitLab Bot 🤖

Merge request reports