diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:08:01 +0300 |
| commit | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (patch) | |
| tree | 55f2a32e5fd3d67597fc8c6cc2a01793ee15c87a /app/views/projects/settings | |
| parent | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (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 | 2 |
2 files changed, 2 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 9e47e380266..ab2f64cdc21 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -54,6 +54,8 @@ = 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) } .settings-header %h4 diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml index 3d1eb85da0d..5bf92d32474 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -11,8 +11,6 @@ -# Those are used throughout the actual views. These `shared` views are then -# reused in EE. = render "projects/settings/repository/protected_branches" - -= render @deploy_keys = render "projects/cleanup/show" = render_if_exists 'shared/promotions/promote_repository_features' |