diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 21:09:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 21:09:07 +0300 |
commit | 1c8fa70f9d0818e2a82089c8643a6e455bca47fd (patch) | |
tree | f339f97de0425270bdd909e2f4d378927b6e0a18 /app/views/projects/settings | |
parent | 736d36d8597d0d1ec1b47644e6d091c3f4a78f45 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/settings')
-rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 3 | ||||
-rw-r--r-- | app/views/projects/settings/repository/show.html.haml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 1358077f2b2..9e47e380266 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -4,6 +4,7 @@ - expanded = expanded_by_default? - general_expanded = @project.errors.empty? ? expanded : true +- deploy_token_description = s_('DeployTokens|Deploy tokens allow read-only access to your repository and registry images.') %section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) } .settings-header @@ -51,6 +52,8 @@ .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 + %section.settings.no-animate#js-pipeline-triggers{ class: ('expanded' if expanded) } .settings-header %h4 diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml index ff30cc4f6db..3d1eb85da0d 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -13,7 +13,6 @@ = 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' |