Merge branch 'ee-6104-ee-ce-difference' into 'master'

Unified repository/show.html for CE and EE

Closes #6104

See merge request gitlab-org/gitlab-ee!13562

app/views/projects/settings/repository/_protected_branches.html.haml

+= render "projects/protected_branches/index"
+= render "projects/protected_tags/index"

app/views/projects/settings/repository/show.html.haml

@@ -3,23 +3,17 @@
 - @content_class = "limit-container-width" unless fluid_layout
 
 = render "projects/default_branch/show"
-= render "projects/push_rules/index"
+= render_if_exists "projects/push_rules/index"
 = render "projects/mirrors/mirror_repos"
 
 -# Protected branches & tags use a lot of nested partials.
 -# The shared parts of the views can be found in the `shared` directory.
 -# Those are used throughout the actual views. These `shared` views are then
 -# reused in EE.
-- if @project.feature_available?(:protected_refs_for_users, current_user)
-  .js-protected-refs-for-users
-    = render "projects/protected_branches/ee/index"
-    = render "projects/protected_tags/ee/index"
-- else
-  = render "projects/protected_branches/index"
-  = render "projects/protected_tags/index"
+= render "projects/settings/repository/protected_branches"
 
 = render @deploy_keys
 = render "projects/deploy_tokens/index"
 = render "projects/cleanup/show"
 
-= render 'shared/promotions/promote_repository_features'
+= render_if_exists 'shared/promotions/promote_repository_features'

changelogs/unreleased/6104-ee-ce-difference.yml

+---
+title: Unified EE/CS differences in repository/show.html
+merge_request: 13562
+author:
+type: other

ee/app/views/projects/settings/repository/_protected_branches.html.haml

+- if @project.feature_available?(:protected_refs_for_users, current_user)
+  .js-protected-refs-for-users
+    = render "projects/protected_branches/ee/index"
+    = render "projects/protected_tags/ee/index"
+- else
+  = render "projects/protected_branches/index"
+  = render "projects/protected_tags/index"