"Resolve conflicts on GitLab" MR link is incorrectly vertically aligned
Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.
Summary
Steps to reproduce
In a repository you have write access to, create a merge request with a conflict.
Example Project
What is the current bug behavior?
The conflict-resolution links appear lower-down than the surrounding text.
What is the expected correct behavior?
The links should be correctly aligned with the surrounding text.
Relevant logs and/or screenshots
Output of checks
Results of GitLab environment info
Expand for output related to GitLab environment info
(For installations with omnibus-gitlab package run and paste the output of: \`sudo gitlab-rake gitlab:env:info\`) (For installations from source run and paste the output of: \`sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production\`)
Results of GitLab application Check
Expand for output related to the GitLab application check
(For installations with omnibus-gitlab package run and paste the output of: `sudo gitlab-rake gitlab:check SANITIZE=true`) (For installations from source run and paste the output of: `sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production SANITIZE=true`) (we will only investigate if the tests are passing)
Possible fixes
The links have .gl-align-text-bottom, which applies vertical-align: text-bottom, which is not correct. The links need vertical-align: baseline to make them properly-aligned:
The relevant code appears to be https://gitlab.com/gitlab-org/gitlab/-/blob/dd952503d95bc1b6d54c43e77f3d8e22e420f136/app/assets/javascripts/diffs/components/diff_file.vue#L506-515
Patch release information for backports
If the bug fix needs to be backported in a patch release to a version under the maintenance policy, please follow the steps on the patch release runbook for GitLab engineers.
Refer to the internal "Release Information" dashboard for information about the next patch release, including the targeted versions, expected release date, and current status.
High-severity bug remediation
To remediate high-severity issues requiring an internal release for single-tenant SaaS instances, refer to the internal release process for engineers.