diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 04:43:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 04:43:31 +0300 |
commit | e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d (patch) | |
tree | cf76b0527f1909eaf1ecac057a4ccc7591cce4f6 /app/views | |
parent | 5fc725def41e6973e92bc32095774edd60fd154f (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/views')
5 files changed, 13 insertions, 6 deletions
diff --git a/app/views/groups/settings/ci_cd/show.html.haml b/app/views/groups/settings/ci_cd/show.html.haml index 4aef30622cd..8c9b859e127 100644 --- a/app/views/groups/settings/ci_cd/show.html.haml +++ b/app/views/groups/settings/ci_cd/show.html.haml @@ -3,7 +3,6 @@ - expanded = expanded_by_default? - general_expanded = @group.errors.empty? ? expanded : true -- deploy_token_description = s_('DeployTokens|Group deploy tokens allow read-only access to the repositories and registry images within the group.') -# Given we only have one field in this form which is also admin-only, -# we don't want to show an empty section to non-admin users, @@ -25,8 +24,6 @@ .settings-content = render 'ci/variables/index', save_endpoint: group_variables_path -= render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description - %section.settings#runners-settings.no-animate{ class: ('expanded' if expanded) } .settings-header %h4 diff --git a/app/views/groups/settings/repository/show.html.haml b/app/views/groups/settings/repository/show.html.haml new file mode 100644 index 00000000000..1f1d7779267 --- /dev/null +++ b/app/views/groups/settings/repository/show.html.haml @@ -0,0 +1,6 @@ +- breadcrumb_title _('Repository Settings') +- page_title _('Repository') + +- deploy_token_description = s_('DeployTokens|Group deploy tokens allow read-only access to the repositories and registry images within the group.') + += render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 8115c713a4f..f63a7b3a664 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -155,6 +155,11 @@ %span = _('Projects') + = nav_link(controller: :repository) do + = link_to group_settings_repository_path(@group), title: _('Repository') do + %span + = _('Repository') + = nav_link(controller: :ci_cd) do = link_to group_settings_ci_cd_path(@group), title: _('CI / CD') do %span diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index c0f60b5f3b1..4c9de58cc01 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -4,7 +4,6 @@ - expanded = expanded_by_default? - general_expanded = @project.errors.empty? ? expanded : true -- deploy_token_description = s_('DeployTokens|Deploy tokens allow access to your repository and registry images.') %section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) } .settings-header @@ -52,8 +51,6 @@ .settings-content = render 'ci/variables/index', save_endpoint: project_variables_path(@project) -= render "shared/deploy_tokens/index", group_or_project: @project, description: deploy_token_description - = render @deploy_keys %section.settings.no-animate#js-pipeline-triggers{ class: ('expanded' if expanded) } diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml index 5bf92d32474..77606bfea42 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -1,6 +1,7 @@ - breadcrumb_title _("Repository Settings") - page_title _("Repository") - @content_class = "limit-container-width" unless fluid_layout +- deploy_token_description = s_('DeployTokens|Deploy tokens allow access to your repository and registry images.') = render "projects/default_branch/show" = render_if_exists "projects/push_rules/index" @@ -11,6 +12,7 @@ -# Those are used throughout the actual views. These `shared` views are then -# reused in EE. = render "projects/settings/repository/protected_branches" += render "shared/deploy_tokens/index", group_or_project: @project, description: deploy_token_description = render "projects/cleanup/show" = render_if_exists 'shared/promotions/promote_repository_features' |