diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 01:43:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 01:43:31 +0000 |
| commit | e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d (patch) | |
| tree | cf76b0527f1909eaf1ecac057a4ccc7591cce4f6 /app/views/projects | |
| parent | 5fc725def41e6973e92bc32095774edd60fd154f (diff) | |
| download | gitlab-ce-e20a1cde5d740fbc9f4d033786a8cd5ad7eb8b4d.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/settings/repository/show.html.haml | 2 |
2 files changed, 2 insertions, 3 deletions
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' |