diff options
| author | Denys Mishunov <dmishunov@gitlab.com> | 2019-05-29 13:13:49 +0200 |
|---|---|---|
| committer | Denys Mishunov <dmishunov@gitlab.com> | 2019-05-29 16:47:31 +0200 |
| commit | c56906d5dca63c23f2ccbc9f337dd7be1b4cae45 (patch) | |
| tree | a728ef30cdefb641d932edf357390f198f4d0e8d | |
| parent | 94a778903d3180ced9d25d1f086553081cfaa593 (diff) | |
| download | gitlab-ce-6104-ee-ce-difference.tar.gz | |
Unified repository/show.html for CE and EE6104-ee-ce-difference
Corresponding partials containing differences have been added to
corresponding folder.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6104
3 files changed, 12 insertions, 2 deletions
diff --git a/app/views/projects/settings/repository/_protected_branches.html.haml b/app/views/projects/settings/repository/_protected_branches.html.haml new file mode 100644 index 00000000000..31630828571 --- /dev/null +++ b/app/views/projects/settings/repository/_protected_branches.html.haml @@ -0,0 +1,2 @@ += render "projects/protected_branches/index" += render "projects/protected_tags/index" diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml index cb3a035c49e..ff30cc4f6db 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -3,14 +3,17 @@ - @content_class = "limit-container-width" unless fluid_layout = render "projects/default_branch/show" += 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. -= 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_if_exists 'shared/promotions/promote_repository_features' diff --git a/changelogs/unreleased/6104-ee-ce-difference.yml b/changelogs/unreleased/6104-ee-ce-difference.yml new file mode 100644 index 00000000000..59d31daf0eb --- /dev/null +++ b/changelogs/unreleased/6104-ee-ce-difference.yml @@ -0,0 +1,5 @@ +--- +title: Unified EE/CS differences in repository/show.html +merge_request: 13562 +author: +type: other |