Add tooltip to MR widget for "Squash commits" option when at disabled state
Issue #17613 (closed)
| MR | Changes |
|---|---|
| Part 1 > !33099 (merged) | BE implementation |
| Part 2 > !33827 (merged) | FE implementation of squash option and MR form |
| Part 3 > !34891 (merged) | FE implementation of squash option in MR widget |
|
|
FE implementation of squash option tooltip |
| Part 5 > !35111 (merged) | FE implementation of squash option message in MR form |
| Part 6 > !35392 (merged) | Additional spec for testing edge case for part 2 |
| Docs > !33930 (merged) | Documentation |
What does this MR do?
This MR will add a tooltip message informing the user why the squash commits checkbox is disabled. (There will be no tooltip message when the checkbox is enabled)
Testing Case
This is hidden behind a feature flag, docs
rails c
Feature.enable(:squash_options)- Go to a Merge Request
-
The Squash commits will have the follow tooltip message:
| Project Setting | Tooltip |
|---|---|
| Do not allow | not applicable, hidden |
| Require | Required in this project |
| Allow | no tooltip |
| Encourage | no tooltip |
Setup
To set the project setting:
- Go to the Settings > General page > expand Merge requests
Screenshots
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
Closes #223029 (closed)
Edited by Samantha Ming