<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=325951) </details> <!--IssueSummary end--> <!-- The first section "Release notes" is required if you want to have your release post blog MR auto generated. Currently in BETA, details on the **release post item generator** can be found in the handbook: https://about.gitlab.com/handbook/marketing/blog/release-posts/#release-post-item-generator and this video: https://www.youtube.com/watch?v=rfn9ebgTwKg. The next four sections: "Problem to solve", "Intended users", "User experience goal", and "Proposal", are strongly recommended in your first draft, while the rest of the sections can be filled out during the problem validation or breakdown phase. However, keep in mind that providing complete and relevant information early helps our product team validate the problem and start working on a solution. --> ### Release notes Add applied suggestions as 'fixup' commits to force squashing them ### Problem to solve As a code maintainer, I want 'Apply suggestion' to keep Git history clean. Currently using 'Apply suggestion' during code review creates commits with title 'Apply 1 suggestion(s) to 1 file(s)'. This produces a rubbish commit, violating [nearly all rules of creating commits](https://chris.beams.io/posts/git-commit/): the title is extremely unhelpful and contents are too small to have a meaning. I followed steps above and the ugly result looks like this: https://gitlab.com/pkubowicz/reproducing-bugs/-/merge_requests/4/commits 'Apply suggestion' feature encourages creating multiple small meaningless commits on top of real changes and when the MR is merged, the pipeline will show 'Apply 1 suggestion(s) to 1 file(s)' (instead of something related to the MR itself, which happens usually), so you won't know if these are dangerous changes that break backward compatibility or something totally safe. There is nothing in GitLab that warns the person merging a MR that those added commits should be squashed. It's too easy to add rubbish to Git history even if you have good intentions. As a consequence, currently I am introducing a rule in my team that forbids using 'Apply suggestion' feature and I am changing scripts in `.gitlab-ci.yml` to fail a build if you use 'Apply suggestion', because we agreed that this feature encourages incorrect behaviour. ### Intended users * [Sasha (Software Developer)](https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/#sasha-software-developer) ### User experience goal The user should know how to review and merge Merge Requests in GitLab ### Proposal No need to change the UI. Each applied suggestion should create a Git commit starting with `fixup!`. User should not be able to remove this prefix when changing the commit text in 'Apply suggestion' dialog. User input should define text added *after* the first line of the commit message, not the whole commit message. This should integrate nicely with existing GitLab functionality. For example, will prevent merging a MR with such commits, as it will become draft (see [Mark merge requests as drafts](https://docs.gitlab.com/ee/user/project/merge_requests/drafts.html#mark-merge-requests-as-drafts) in the documentation). Only after those small commits are squashed a reviewer will be able to merge. <!-- How are we going to solve the problem? Try to include the user journey! https://about.gitlab.com/handbook/journeys/#user-journey --> ### Further details Alternatively, adding suggestion could enable 'squash' option for a MR, but this would be complicated, as there are repository-level settings on how squashes are handled. I think the option with 'fixup' is better. <!-- Include use cases, benefits, goals, or any other details that will help us understand the problem better. --> ### Permissions and Security <!-- What permissions are required to perform the described actions? Are they consistent with the existing permissions as documented for users, groups, and projects as appropriate? Is the proposed behavior consistent between the UI, API, and other access methods (e.g. email replies)? Consider adding checkboxes and expectations of users with certain levels of membership https://docs.gitlab.com/ee/user/permissions.html * [ ] Add expected impact to members with no access (0) * [ ] Add expected impact to Guest (10) members * [ ] Add expected impact to Reporter (20) members * [ ] Add expected impact to Developer (30) members * [ ] Add expected impact to Maintainer (40) members * [ ] Add expected impact to Owner (50) members --> ### Documentation <!-- See the Feature Change Documentation Workflow https://docs.gitlab.com/ee/development/documentation/workflow.html#for-a-product-change * Add all known Documentation Requirements in this section. See https://docs.gitlab.com/ee/development/documentation/workflow.html * If this feature requires changing permissions, update the permissions document. See https://docs.gitlab.com/ee/user/permissions.html --> ### Availability & Testing <!-- This section needs to be retained and filled in during the workflow planning breakdown phase of this feature proposal, if not earlier. What risks does this change pose to our availability? How might it affect the quality of the product? What additional test coverage or changes to tests will be needed? Will it require cross-browser testing? Please list the test areas (unit, integration and end-to-end) that needs to be added or updated to ensure that this feature will work as intended. Please use the list below as guidance. * Unit test changes * Integration test changes * End-to-end test change See the test engineering planning process and reach out to your counterpart Software Engineer in Test for assistance: https://about.gitlab.com/handbook/engineering/quality/test-engineering/#test-planning --> ### Available Tier <!-- This section should be used for setting the appropriate tier that this feature will belong to. Pricing can be found here: https://about.gitlab.com/pricing/ * Free * Premium/Silver * Ultimate/Gold --> ### What does success look like, and how can we measure that? <!-- Define both the success metrics and acceptance criteria. Note that success metrics indicate the desired business outcomes, while acceptance criteria indicate when the solution is working correctly. If there is no way to measure success, link to an issue that will implement a way to measure this. Create tracking issue using the the Snowplow event tracking template. See https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Snowplow%20event%20tracking.md --> For a MR that has 'sqush' option disabled, a MR reviewer is not able to apply a suggestion and then immediately merge the MR. When MR reviewers act in good faith, commits with title 'Apply 1 suggestion(s) to 1 file(s)' will never appear in Git repository. ### What is the type of buyer? <!-- What is the buyer persona for this feature? See https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/buyer-persona/ In which enterprise tier should this feature go? See https://about.gitlab.com/handbook/product/pricing/#three-tiers --> ### Is this a cross-stage feature? <!-- Communicate if this change will affect multiple Stage Groups or product areas. We recommend always start with the assumption that a feature request will have an impact into another Group. Loop in the most relevant PM and Product Designer from that Group to provide strategic support to help align the Group's broader plan and vision, as well as to avoid UX and technical debt. https://about.gitlab.com/handbook/product/#cross-stage-features --> ### Links / references <!-- Label reminders - you should have one of each of the following labels. Use the following resources to find the appropriate labels: - https://gitlab.com/gitlab-org/gitlab/-/labels - https://about.gitlab.com/handbook/product/categories/features/ -->