Merge branch '51476-private-profile-help-url-should-not-toggle-checkbox' into 'master'

Resolve "Private profile help url should not toggle checkbox"

Closes #51476

See merge request gitlab-org/gitlab-ce!21757

app/assets/stylesheets/framework/common.scss

@@ -324,6 +324,16 @@ img.emoji {
   word-wrap: break-word;
 }
 
+.checkbox-icon-inline-wrapper {
+  .checkbox {
+    display: inline;
+
+    label {
+      display: inline;
+    }
+  }
+}
+
 /** COMMON CLASSES **/
 .prepend-top-0 { margin-top: 0; }
 .prepend-top-2 { margin-top: 2px; }

app/views/profiles/show.html.haml

@@ -109,10 +109,11 @@
       = f.text_area :bio, rows: 4, maxlength: 250, help: s_("Profiles|Tell us about yourself in fewer than 250 characters.")
       %hr
       %h5= ("Private profile")
-      - private_profile_label = capture do
-        = s_("Profiles|Don't display activity-related personal information on your profiles")
+      .checkbox-icon-inline-wrapper
+        - private_profile_label = capture do
+          = s_("Profiles|Don't display activity-related personal information on your profiles")
+        = f.check_box :private_profile, label: private_profile_label
         = link_to icon('question-circle'), help_page_path('user/profile/index.md', anchor: 'private-profile')
-      = f.check_box :private_profile, label: private_profile_label
       %h5= s_("Profiles|Private contributions")
       = f.check_box :include_private_contributions, label: 'Include private contributions on my profile'
       .help-block

changelogs/unreleased/51476-private-profile-help-url-should-not-toggle-checkbox.yml

+---
+title: Prevents private profile help link from toggling checkbox
+merge_request: 21757
+author:
+type: other