diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 15:09:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 15:09:42 +0300 |
| commit | 403678e00406edc8094f087ec70e00aa29e49bef (patch) | |
| tree | 447d6d4967e9a11895683b27e637a50bd9fc0602 /app/views | |
| parent | f5050253469fc0961c02deec0e698ad62bdd9de5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/_activities.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/settings/_general.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/groups/_activities.html.haml b/app/views/groups/_activities.html.haml index 44554cab1e9..47e7e27de48 100644 --- a/app/views/groups/_activities.html.haml +++ b/app/views/groups/_activities.html.haml @@ -5,4 +5,6 @@ %i.fa.fa-rss .content_list -= spinner +.loading + .spinner.spinner-md + diff --git a/app/views/projects/settings/_general.html.haml b/app/views/projects/settings/_general.html.haml index 520f342f567..0f60fc18026 100644 --- a/app/views/projects/settings/_general.html.haml +++ b/app/views/projects/settings/_general.html.haml @@ -20,6 +20,8 @@ = f.text_field :tag_list, value: @project.tag_list.join(', '), maxlength: 2000, class: "form-control" %p.form-text.text-muted= _('Separate topics with commas.') + = render_if_exists 'compliance_management/compliance_framework/project_settings', f: f + .row .form-group.col-md-9 = f.label :description, _('Project description (optional)'), class: 'label-bold' |