Skip to content

GitLab Next

    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Menu
    Projects Groups Snippets
  • Sign up now
  • Login
  • Sign in / Register
  • GitLab GitLab
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 42,969
    • Issues 42,969
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 1,369
    • Merge requests 1,369
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.org
  • GitLabGitLab
  • Merge requests
  • !49052

Use a separate commit for formatting changes

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Enrique Alcántara requested to merge 277083-save-formatting-changes-in-separate-commit into master Dec 02, 2020
  • Overview 25
  • Commits 2
  • Pipelines 15
  • Changes 14

What does this MR do?

Problem

One of the most frequent points of feedback from our roll-out of the Static Site Editor in the GitLab Handbook has been the volume of changes made to the source file simply as a result of opening the page in the WYSIWYG editor. We have tried to limit this by matching the expected Markdown formatting to the documented GitLab Markdown style guide. However, the reality is that many of the pages on the GitLab handbook to not adhere strictly to this style guide.

Proposal

To avoid cluttering the changes made by the user in the Static Site Editor with the auto-formatting changes, let’s separate both changesets in different commits. This will allow users to isolate and share the specific commit containing only their changes

Screenshots (strongly suggested)

After saving changes with the Static Site Editor, if the user opens the Merge Request created by the editor, they should see two commits. One of them contain the formatting changes introduced by the editor. The other one contains the changes introduced by the user

image

Does this MR meet the acceptance criteria?

Conformity

  • Changelog entry
  • Documentation (if required)
  • Code review guidelines
  • Merge request performance guidelines
  • Style guides
  • Database guides
  • Separation of EE specific content

Availability and Testing

  • Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process.
  • Tested in all supported browsers
  • Informed Infrastructure department of a default or new setting change, if applicable per definition of done

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

Related to #277083 (closed)

Edited Dec 03, 2020 by Enrique Alcántara
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: 277083-save-formatting-changes-in-separate-commit