diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-09 21:09:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-09 21:09:15 +0000 |
| commit | d8d0344cc3602e2625b7bbd79360b3e5b20b8870 (patch) | |
| tree | 600a1eae6972365ac8a746054abf223318841068 /app/views/projects | |
| parent | 72c331ebf56ba3d49a79ec799de84e790748adef (diff) | |
| download | gitlab-ce-d8d0344cc3602e2625b7bbd79360b3e5b20b8870.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/cleanup/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/cleanup/_show.html.haml b/app/views/projects/cleanup/_show.html.haml index f9af116fbff..b0112be0e3d 100644 --- a/app/views/projects/cleanup/_show.html.haml +++ b/app/views/projects/cleanup/_show.html.haml @@ -2,7 +2,7 @@ %section.settings.no-animate#cleanup{ class: ('expanded' if expanded) } .settings-header - %h4= _('Repository cleanup') + %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Repository cleanup') %button.btn.gl-button.btn-default.js-settings-toggle = expanded ? _('Collapse') : _('Expand') %p diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 509092b64c9..425f76bd8d6 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -20,7 +20,7 @@ .col-md-12.col-lg-6 .gl-display-flex.gl-flex-wrap.gl-justify-content-end .js-invite-group-trigger{ data: { classes: 'gl-mt-3 gl-sm-w-auto gl-w-full', display_text: _('Invite a group') } } - .js-invite-members-trigger{ data: { classes: 'btn btn-success gl-button gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', display_text: _('Invite members') } } + .js-invite-members-trigger{ data: { variant: 'success', classes: 'gl-mt-3 gl-sm-w-auto gl-w-full gl-sm-ml-3', display_text: _('Invite members') } } = render 'projects/invite_members_modal', project: @project - else |