Skip to content

[Commit Page] Migrate to GlModal for revert commit

What does this MR do?

  • Migrate to use GlModal from generic bootstrap modal for the Revert from a commit as rendered from app/views/projects/commit/show.html.haml

What this MR doesn't do

  • handle revert from merge request, that will be handled as part of the plan in subsequent MR(s).
  • handle cherry-pick from commit or merge request, that will be handled as part of the plan in subsequent MR(s).

Notable changes to UX

  • cancel/revert button alignment with default pajamas - can see the difference easily by selecting cherry-pick from dropdown instead of revert
  • dropdown to use pajamas version, and the look/behavior is slightly changed.

Reproducing locally(gdk)

  • Go to a project and find a commit. Click into it and then use the options dropdown as seen in the screenshots below.

Screenshots (strongly suggested)

Images

action before after
view button Screen_Shot_2020-12-23_at_1.26.16_PM Screen_Shot_2020-12-30_at_4.48.19_PM
click button Screen_Shot_2020-12-23_at_1.32.02_PM Screen_Shot_2020-12-30_at_4.48.44_PM
show dropdown Screen_Shot_2020-12-23_at_1.32.15_PM Screen_Shot_2020-12-30_at_4.49.11_PM
revert click Screen_Shot_2020-12-23_at_1.33.51_PM Screen_Shot_2020-12-30_at_4.49.42_PM
branch in fork(can't push code) Screen_Shot_2020-12-30_at_6.39.51_PM Screen_Shot_2020-12-30_at_4.59.08_PM
commit to same branch with MR open(not valid for commit outside MR) Screen_Shot_2020-12-30_at_6.40.56_PM Screen_Shot_2020-12-30_at_5.01.11_PM

Videos

Before(ignore the failure at the end as that is a commit/local issue)

Screen_Recording_2020-12-30_at_6.42.32_PM

After

Screen_Recording_2020-12-30_at_4.46.27_PM

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

Related to #229679

Edited by Doug Stull

Merge request reports