Skip to content
Snippets Groups Projects
Commit 0022db69 authored by Kushal Pandya's avatar Kushal Pandya :speech_balloon:
Browse files

Merge branch 'mr-merge-blocked-message-spacing' into 'master'

Merge blocked: change spacing of merge details

See merge request !116274



Merged-by: Kushal Pandya's avatarKushal Pandya <kushal@gitlab.com>
Approved-by: default avatarAnnabel Dunstone Gray <annabel.m.gray@gmail.com>
Approved-by: Kushal Pandya's avatarKushal Pandya <kushal@gitlab.com>
Co-authored-by: default avatarSascha Eggenberger <seggenberger@gitlab.com>
parents 480d6319 a7bb7fcf
No related branches found
No related tags found
3 merge requests!118700Remove refactor_vulnerability_filters feature flag,!116602Draft: Resolve "Remove the possibility to set redis_slot in known_events",!116274Merge blocked: change spacing of merge details
Pipeline #823862162 failed
Pipeline: GitLab

#823872666

    Pipeline: GitLab

    #823872628

      Pipeline: GitLab

      #823862656

        ......@@ -528,7 +528,7 @@ export default {
        >
        <template v-if="shouldShowMergeControls">
        <div
        class="gl-display-flex gl-sm-flex-direction-column gl-md-align-items-center gl-flex-wrap-wrap gl-w-full gl-md-pb-5"
        class="gl-display-flex gl-sm-flex-direction-column gl-md-align-items-center gl-flex-wrap-wrap gl-w-full gl-md-pb-2"
        >
        <gl-form-checkbox
        v-if="canRemoveSourceBranch"
        ......@@ -598,9 +598,7 @@ export default {
        </li>
        </ul>
        </div>
        <div
        class="gl-w-full gl-text-gray-500 gl-mb-3 gl-md-mb-0 gl-md-pb-5 mr-widget-merge-details"
        >
        <div class="gl-w-full gl-text-gray-500 gl-mb-3 mr-widget-merge-details">
        <template v-if="sourceHasDivergedFromTarget">
        <gl-sprintf :message="$options.i18n.sourceDivergedFromTargetText">
        <template #link>
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment