Separate CE from EE views

app/views/projects/mirrors/_push.html.haml

-- expanded = Rails.env.test?
-%section.settings.no-animate#js-push-remote-settings{ class: ('expanded' if expanded) }
-  .settings-header
-    %h4
-      Push to a remote repository
-    %button.btn.js-settings-toggle
-      = expanded ? 'Collapse' : 'Expand'
-    %p
-      Set up the remote repository that you want to update with the content of the current repository
-      every time someone pushes to it.
-      = link_to 'Read more', help_page_path('workflow/repository_mirroring', anchor: 'pushing-to-a-remote-repository'), target: '_blank'
-  .settings-content
-    = form_for @project, url: project_mirror_path(@project) do |f|
-      %div
-        = form_errors(@project)
-      = render "shared/remote_mirror_update_button", remote_mirror: @remote_mirror
-      - if @remote_mirror.last_error.present?
-        .card.bg-danger
-          .card-header
-            - if @remote_mirror.last_update_at
-              The remote repository failed to update #{time_ago_with_tooltip(@remote_mirror.last_update_at)}.
-            - else
-              The remote repository failed to update.
-
-            - if @remote_mirror.last_successful_update_at
-              Last successful update #{time_ago_with_tooltip(@remote_mirror.last_successful_update_at)}.
-          .card-body
-            %pre
-              :preserve
-                #{h(@remote_mirror.last_error.strip)}
-      = f.fields_for :remote_mirrors, @remote_mirror do |rm_form|
-        .form-group
-          = rm_form.check_box :enabled, class: "float-left"
-          .prepend-left-20
-            = rm_form.label :enabled, "Remote mirror repository", class: "label-bold append-bottom-0"
-            %p.light.append-bottom-0
-              Automatically update the remote mirror's branches, tags, and commits from this repository every time someone pushes to it.
-        .form-group.has-feedback
-          = rm_form.label :url, "Git repository URL", class: "label-bold"
-          = rm_form.text_field :url, class: "form-control", placeholder: 'https://username:password@gitlab.company.com/group/project.git'
-
-          = render "projects/mirrors/instructions"
-
-        .form-group
-          = rm_form.check_box :only_protected_branches, class: 'float-left'
-          .prepend-left-20
-            = rm_form.label :only_protected_branches, class: 'label-bold'
-            = link_to icon('question-circle'), help_page_path('user/project/protected_branches')
-
-        = f.submit 'Save changes', class: 'btn btn-create', name: 'update_remote_mirror'

ee/app/views/projects/mirrors/_push_pull.html.haml → app/views/projects/mirrors/_push_pull.html.haml

 - expanded = Rails.env.test?
-- import_data = @project.import_data || @project.build_import_data
 - protocols = Gitlab::UrlSanitizer::ALLOWED_SCHEMES.join('|')
-- is_one_user_option = default_mirror_users.count == 1
 - can_push = can?(current_user, :admin_remote_mirror, @project)
 - can_pull = can?(current_user, :admin_mirror, @project)
 - options = []
@@ -35,44 +33,7 @@
             = label_tag :mirror_direction, _('Mirror direction'), class: 'label-light'
             = select_tag :mirror_direction, options_for_select(options), class: 'form-control js-mirror-direction'
 
-          .js-form-insertion-point
-
-          - if can_push
-            %template.js-push-mirrors-form
-              = f.fields_for :remote_mirrors, @remote_mirror do |rm_f|
-                = rm_f.hidden_field :enabled, value: '1'
-                = rm_f.hidden_field :url, class: 'js-mirror-url-hidden', required: true, pattern: "(#{protocols}):\/\/.+"
-                = rm_f.hidden_field :only_protected_branches, class: 'js-mirror-protected-hidden'
-
-          - if can_pull
-            %template.js-pull-mirrors-form
-              = f.hidden_field :mirror, value: '1'
-              = f.hidden_field :username_only_import_url, class: 'js-mirror-url-hidden', required: true, pattern: "(#{protocols}):\/\/.+"
-              = f.hidden_field :only_mirror_protected_branches, class: 'js-mirror-protected-hidden'
-
-              = f.fields_for :import_data, import_data do |import_form|
-                = render partial: 'projects/mirrors/pull/ssh_host_keys', locals: { f: import_form }
-                = render partial: 'projects/mirrors/pull/authentication_method', locals: { f: import_form }
-
-              .form-group
-                = f.label :mirror_user_id, _('Mirror user'), class: 'label-light'
-                - if is_one_user_option
-                  = select_tag(:mirror_user_id_select, options_for_mirror_user, class: 'js-mirror-user select2 lg append-bottom-5', required: true, disabled: true)
-                  = f.hidden_field :mirror_user_id, value: default_mirror_users.first.id if is_one_user_option
-                - else
-                  = f.select(:mirror_user_id, options_for_mirror_user, {}, class: 'js-mirror-user select2 lg append-bottom-5', required: true)
-
-                .help-block
-                  = _('This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches. Upon creation or when reassigning you can only assign yourself to be the mirror user.')
-
-              .form-check.append-bottom-10
-                = f.check_box :mirror_overwrites_diverged_branches, class: 'form-check-input', checked: false
-                = f.label :mirror_overwrites_diverged_branches, _('Overwrite diverged branches'), class: 'form-check-label'
-                .form-text.text-muted
-                  = _("If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart, to prevent local data loss. If the default branch (%{default_branch}) has diverged and cannot be updated, mirroring will fail. Other diverged branches are silently ignored.") % { default_branch: @project.default_branch }
-
-              - if @project.builds_enabled?
-                = render 'shared/mirror_trigger_builds_setting', f: f, checked: false
+          = render 'projects/mirrors/push_pull_form', can_push: can_push, can_pull: can_pull, f: f
 
           .form-check.append-bottom-10
             = check_box_tag :only_protected_branches, '1', false, class: 'js-mirror-protected form-check-input'

app/views/projects/mirrors/_push_pull_form.html.haml

+- import_data = @project.import_data || @project.build_import_data
+- is_one_user_option = default_mirror_users.count == 1
+
+= f.fields_for :remote_mirrors, @remote_mirror do |rm_f|
+  = rm_f.hidden_field :enabled, value: '1'
+  = rm_f.hidden_field :url, class: 'js-mirror-url-hidden', required: true, pattern: "(#{protocols}):\/\/.+"
+  = rm_f.hidden_field :only_protected_branches, class: 'js-mirror-protected-hidden'
\ No newline at end of file

ee/app/views/projects/mirrors/_pull.html.haml

-- expanded = Rails.env.test?
-- import_data = @project.import_data || @project.build_import_data
-- protocols = Gitlab::UrlSanitizer::ALLOWED_SCHEMES.join('|')
-
-%section.settings.project-mirror-settings.no-animate#js-pull-remote-repository{ class: ('expanded' if expanded) }
-  .settings-header
-    %h4
-      Pull from a remote repository
-    %button.btn.js-settings-toggle
-      = expanded ? 'Collapse' : 'Expand'
-    %p
-      Set up your project to automatically have its branches, tags, and commits
-      updated from an upstream repository.
-      = link_to 'Read more', help_page_path('workflow/repository_mirroring', anchor: 'pulling-from-a-remote-repository'), target: '_blank'
-  .settings-content
-    = form_for @project, url: project_mirror_path(@project), html: { class: 'gl-show-field-errors project-mirror-push-form js-project-mirror-push-form', autocomplete: 'false', data: { project_mirror_endpoint: ssh_host_keys_project_mirror_path(@project, :json) } } do |f|
-      %div
-        = form_errors(@project)
-      = render "shared/mirror_update_button"
-      = render "projects/mirrors/pull/mirror_update_fail"
-      .form-group
-        = f.check_box :mirror, class: "float-left"
-        .prepend-left-20
-          = f.label :mirror, "Mirror repository", class: "label-bold append-bottom-0"
-
-      .form-group
-        = f.label :username_only_import_url, "Git repository URL", class: "label-bold"
-        = f.text_field :username_only_import_url, class: 'form-control js-repo-url', placeholder: 'https://username@gitlab.company.com/group/project.git', required: 'required', pattern: "(#{protocols}):\/\/.+", title: 'URL must have protocol present (eg; ssh://...)'
-
-      = render "projects/mirrors/instructions"
-
-      = f.fields_for :import_data, import_data do |import_form|
-        = render partial: "projects/mirrors/pull/ssh_host_keys", locals: { f: import_form }
-        = render partial: "projects/mirrors/pull/authentication_method", locals: { f: import_form }
-
-      .form-group
-        = f.label :mirror_user_id, "Mirror user", class: "label-bold"
-        = select_tag('project[mirror_user_id]', options_for_mirror_user, class: "select2 lg", required: true)
-        .form-text.text-muted
-          This user will be the author of all events in the activity feed that are the result of an update,
-          like new branches being created or new commits being pushed to existing branches.
-          You can only assign yourself to be the mirror user.
-
-      .form-group
-        = f.check_box :only_mirror_protected_branches, class: 'float-left'
-        .prepend-left-20
-          = f.label :only_mirror_protected_branches, class: 'label-bold'
-          = link_to icon('question-circle'), help_page_path('user/project/protected_branches')
-
-      .form-group
-        = f.check_box :mirror_overwrites_diverged_branches, class: 'float-left'
-        .prepend-left-20
-          = f.label :mirror_overwrites_diverged_branches, "Overwrite diverged branches", class: 'label-bold'
-          .form-text.text-muted
-            If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart,
-            to prevent local data loss. If the default branch (#{@project.default_branch}) has diverged and cannot be updated,
-            mirroring will fail. Other diverged branches are silently ignored.
-
-      - if @project.builds_enabled?
-        = render "shared/mirror_trigger_builds_setting", f: f
-
-      = f.submit 'Save changes', class: 'btn btn-create', name: 'update_remote_mirror'

ee/app/views/projects/mirrors/_push_pull_form.html.haml

+- import_data = @project.import_data || @project.build_import_data
+- is_one_user_option = default_mirror_users.count == 1
+- protocols = Gitlab::UrlSanitizer::ALLOWED_SCHEMES.join('|')
+
+.js-form-insertion-point
+
+- if can_push
+  %template.js-push-mirrors-form
+    = f.fields_for :remote_mirrors, @remote_mirror do |rm_f|
+      = rm_f.hidden_field :enabled, value: '1'
+      = rm_f.hidden_field :url, class: 'js-mirror-url-hidden', required: true, pattern: "(#{protocols}):\/\/.+"
+      = rm_f.hidden_field :only_protected_branches, class: 'js-mirror-protected-hidden'
+
+- if can_pull
+  %template.js-pull-mirrors-form
+    = f.hidden_field :mirror, value: '1'
+    = f.hidden_field :username_only_import_url, class: 'js-mirror-url-hidden', required: true, pattern: "(#{protocols}):\/\/.+"
+    = f.hidden_field :only_mirror_protected_branches, class: 'js-mirror-protected-hidden'
+
+    = f.fields_for :import_data, import_data do |import_form|
+      = render partial: 'projects/mirrors/pull/ssh_host_keys', locals: { f: import_form }
+      = render partial: 'projects/mirrors/pull/authentication_method', locals: { f: import_form }
+
+    .form-group
+      = f.label :mirror_user_id, _('Mirror user'), class: 'label-light'
+      - if is_one_user_option
+        = select_tag(:mirror_user_id_select, options_for_mirror_user, class: 'js-mirror-user select2 lg append-bottom-5', required: true, disabled: true)
+        = f.hidden_field :mirror_user_id, value: default_mirror_users.first.id if is_one_user_option
+      - else
+        = f.select(:mirror_user_id, options_for_mirror_user, {}, class: 'js-mirror-user select2 lg append-bottom-5', required: true)
+
+      .help-block
+        = _('This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches. Upon creation or when reassigning you can only assign yourself to be the mirror user.')
+
+    .form-check.append-bottom-10
+      = f.check_box :mirror_overwrites_diverged_branches, class: 'form-check-input', checked: false
+      = f.label :mirror_overwrites_diverged_branches, _('Overwrite diverged branches'), class: 'form-check-label'
+      .form-text.text-muted
+        = _("If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart, to prevent local data loss. If the default branch (%{default_branch}) has diverged and cannot be updated, mirroring will fail. Other diverged branches are silently ignored.") % { default_branch: @project.default_branch }
+
+    - if @project.builds_enabled?
+      = render 'shared/mirror_trigger_builds_setting', f: f, checked: false
\ No newline at end of file