Move haml files to EE render partials

- create partials for code owner form, table, & table headers

Move haml files to EE render partials
- create partials for code owner form, table, & table headers
2b80d3d0 · Samantha Ming · cd1e0ca4 · 2b80d3d0 · 2b80d3d0 · 2b80d3d0
--- a/app/views/projects/protected_branches/shared/_branches_list.html.haml
+++ b/app/views/projects/protected_branches/shared/_branches_list.html.haml
@@ -23,9 +23,9 @@
            = s_("ProtectedBranch|Allowed to merge")
          %th
            = s_("ProtectedBranch|Allowed to push")
-          - if @project.merge_requests_require_code_owner_approval
-            %th
-              = s_("ProtectedBranch|Code owner approval")
+
+          = render_if_exists 'shared/projects/code_owner_approval_table_head'
+
          - if can_admin_project
            %th
      %tbody

--- a/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
@@ -24,19 +24,6 @@
          = s_("ProtectedBranch|Allowed to push:")
        .col-md-10
          = yield :push_access_levels
-
-      - if @project.merge_requests_require_code_owner_approval
-        .form-group.row
-          %label.col-md-2.text-right{ for: 'code_owner_approval_required' }
-            = s_("ProtectedBranch|Require approval from code owners:")
-          .col-md-10
-            %button{ type: 'button',
-              class: "js-project-feature-toggle project-feature-toggle is-checked",
-              "aria-label": s_("ProtectedBranch|Toggle code owner approval") }
-              %span.toggle-icon
-                = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
-                = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
-            .form-text.text-muted
-              = s_("ProtectedBranch|Pushes that change filenames matched by the CODEOWNERS file will be rejected")
+      = render_if_exists 'shared/projects/code_owner_approval_form'
    .card-footer
      = f.submit s_('ProtectedBranch|Protect'), class: 'btn-success btn', disabled: true
--- a/app/views/projects/protected_branches/shared/_protected_branch.html.haml
+++ b/app/views/projects/protected_branches/shared/_protected_branch.html.haml
@@ -19,14 +19,7 @@

  = yield

-  - if @project.merge_requests_require_code_owner_approval
-    %td
-      %button{ type: 'button',
-        class: "js-project-feature-toggle project-feature-toggle mr-5 #{'is-checked' if protected_branch.code_owner_approval_required}",
-        "aria-label": s_("ProtectedBranch|Toggle code owner approval") }
-        %span.toggle-icon
-          = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
-          = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
+  = render_if_exists 'shared/projects/code_owner_approval_table', protected_branch: protected_branch

  - if can_admin_project
    %td

--- a/doc/user/project/protected_branches.md
+++ b/doc/user/project/protected_branches.md
@@ -87,11 +87,7 @@ Click **Protect** and the branch will appear in the "Protected branch" list.
 ## Code Owners approvals **(PREMIUM)**

 It is possible to require at least one approval for each entry in the
-<<<<<<< HEAD
 [`CODEOWNERS` file](code_owners.md) that matches a file changed in
-=======
-[`CODEOWNERS` file](../code_owners.md) that matches a file changed in
->>>>>>> Update docs to reflect changes to API and UI
 the merge request. To enable this feature:

 1. Toggle the **Require approval from code owners** slider.

--- a/ee/app/views/shared/projects/_code_owner_approval_form.html.haml
+++ b/ee/app/views/shared/projects/_code_owner_approval_form.html.haml
+- if @project.merge_requests_require_code_owner_approval
+  .form-group.row
+    %label.col-md-2.text-right{ for: 'code_owner_approval_required' }
+      = s_("ProtectedBranch|Require approval from code owners:")
+    .col-md-10
+      %button{ type: 'button',
+        class: "js-project-feature-toggle project-feature-toggle is-checked",
+        "aria-label": s_("ProtectedBranch|Toggle code owner approval") }
+        %span.toggle-icon
+          = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
+          = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
+      .form-text.text-muted
+        = s_("ProtectedBranch|Pushes that change filenames matched by the CODEOWNERS file will be rejected")
--- a/ee/app/views/shared/projects/_code_owner_approval_table.html.haml
+++ b/ee/app/views/shared/projects/_code_owner_approval_table.html.haml
+- if @project.merge_requests_require_code_owner_approval
+  %td
+    %button{ type: 'button',
+      class: "js-project-feature-toggle project-feature-toggle mr-5 #{'is-checked' if protected_branch.code_owner_approval_required}",
+      "aria-label": s_("ProtectedBranch|Toggle code owner approval") }
+      %span.toggle-icon
+        = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
+        = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
--- a/ee/app/views/shared/projects/_code_owner_approval_table_head.html.haml
+++ b/ee/app/views/shared/projects/_code_owner_approval_table_head.html.haml
+- if @project.merge_requests_require_code_owner_approval
+  %th
+    = s_("ProtectedBranch|Code owner approval")