Skip to content

[Commit Page] Migrate to GlModal for cherry-pick commit

What does this MR do?

  • Migrate to use GlModal from generic bootstrap modal for the Cherry-Pick from a commit as rendered from app/views/projects/commit/show.html.haml
  • Adds the revert/cherry pick link and modals to the app/views/projects/commit/pipelines.html.haml

Note Sibling to !50522 (merged)

What this MR doesn't do

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

Notable changes to UX

  • cancel/cherry-pick button alignment with default pajamas
  • dropdown to use pajamas version and the look/behavior is slightly changed.

Reproducing locally(gdk)

  • From a commit
    • Go to a project and find a commit. Click into it and then use the options dropdown as seen in the screenshots below.
  • From pipeline tab on a commit
    • Go to a project and find a commit. Click into it and then click the Pipelines tab and then use the options dropdown as seen in the screenshots below.

Screenshots (strongly suggested)

Images

action before after
view button Screen_Shot_2021-01-18_at_9.27.44_AM Screen_Shot_2021-01-18_at_8.53.33_AM
click button Screen_Shot_2021-01-18_at_9.28.23_AM Screen_Shot_2021-01-18_at_8.54.42_AM
show dropdown Screen_Shot_2021-01-18_at_9.28.51_AM Screen_Shot_2021-01-18_at_8.55.29_AM
Cherry-pick click Screen_Shot_2021-01-18_at_9.32.11_AM Screen_Shot_2021-01-18_at_8.57.15_AM

Videos

Before

Screen_Recording_2021-01-18_at_9.33.29_AM

After

Screen_Recording_2021-01-18_at_9.37.18_AM

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