Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 13 deletions

diff --git a/app/views/projects/_merge_request_target_project_settings.html.haml b/app/views/projects/_merge_request_target_project_settings.html.haml
index 41d37884ac9..6f2917f24e0 100644
--- a/app/views/projects/_merge_request_target_project_settings.html.haml
+++ b/app/views/projects/_merge_request_target_project_settings.html.haml
@@ -8,16 +8,11 @@
     %p.text-secondary
       = s_('ProjectSettings|The default target project for merge requests created in this fork project.')
 
-    .form-check.gl-mb-2
-      = settings.radio_button :mr_default_target_self, false, class: "form-check-input"
-      = label_tag :project_project_setting_attributes_mr_default_target_self_false, class: 'form-check-label' do
-        .gl-font-weight-bold
-          = s_('ProjectSettings|Upstream project')
-        = @project.forked_from_project.full_name
-
-    .form-check.gl-mb-2
-      = settings.radio_button :mr_default_target_self, true, class: "form-check-input"
-      = label_tag :project_project_setting_attributes_mr_default_target_self_true, class: 'form-check-label' do
-        .gl-font-weight-bold
-          = s_('ProjectSettings|This project')
-        = @project.full_name
+    = settings.gitlab_ui_radio_component :mr_default_target_self,
+      false,
+      s_('ProjectSettings|Upstream project'),
+      help_text: @project.forked_from_project.full_name
+    = settings.gitlab_ui_radio_component :mr_default_target_self,
+      true,
+      s_('ProjectSettings|This project'),
+      help_text: @project.full_name