diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 12:10:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 12:10:17 +0300 |
| commit | ad0265eead72a624ce7a020847db4f0f0c877e57 (patch) | |
| tree | 206e0564b02aa9530e3c95f70eb10a77e074bdf0 /app/views/projects | |
| parent | 4dfc8711171fe0c04bc6b8b224687603026dea46 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/_flash_messages.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/mirrors/_authentication_method.html.haml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/_flash_messages.html.haml b/app/views/projects/_flash_messages.html.haml index f9222387e97..52bfc4f1b14 100644 --- a/app/views/projects/_flash_messages.html.haml +++ b/app/views/projects/_flash_messages.html.haml @@ -8,4 +8,5 @@ - unless project.empty_repo? = render 'shared/auto_devops_implicitly_enabled_banner', project: project = render_if_exists 'projects/above_size_limit_warning', project: project + = render_if_exists "layouts/header/ee_subscribable_banner", subscription: true = render_if_exists 'shared/shared_runners_minutes_limit', project: project, classes: [container_class, ("limit-container-width" unless fluid_layout)] diff --git a/app/views/projects/mirrors/_authentication_method.html.haml b/app/views/projects/mirrors/_authentication_method.html.haml index c4f564e26f4..dae0fa958ba 100644 --- a/app/views/projects/mirrors/_authentication_method.html.haml +++ b/app/views/projects/mirrors/_authentication_method.html.haml @@ -11,8 +11,6 @@ = f.hidden_field :auth_method, value: "password", class: "js-hidden-mirror-auth-type" .form-group - .collapse.js-well-changing-auth - .changing-auth-method .well-password-auth.collapse.js-well-password-auth = f.label :password, _("Password"), class: "label-bold" = f.password_field :password, value: mirror.password, class: 'form-control qa-password', autocomplete: 'new-password' |