diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 21:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 21:09:46 +0300 |
| commit | aca82d5ba49a8d2cf7ca30ac4ee6dcbd62b47cff (patch) | |
| tree | 3ce0eff868aab025bc85c37d921582217f4c69f9 /app/views/projects/settings | |
| parent | 8a840df2e433bc39d033b20e64402fa3f56445d3 (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 | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/repository/show.html.haml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 4c9de58cc01..1358077f2b2 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -51,8 +51,6 @@ .settings-content = render 'ci/variables/index', save_endpoint: project_variables_path(@project) -= render @deploy_keys - %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 77606bfea42..193053c8c97 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -13,6 +13,7 @@ -# reused in EE. = render "projects/settings/repository/protected_branches" = render "shared/deploy_tokens/index", group_or_project: @project, description: deploy_token_description += render @deploy_keys = render "projects/cleanup/show" = render_if_exists 'shared/promotions/promote_repository_features' |