diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 18:09:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 18:09:36 +0300 |
| commit | 074d013e1eb3f6e0c27f96a3be8b9361254c8a98 (patch) | |
| tree | f185c474ddc8624a4793c84b0b1f4cc07349694b /app/views | |
| parent | 8f9beefac3774b30e911fb00a68f4c7a5244cf27 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/wikis/_sidebar.html.haml | 5 | ||||
| -rw-r--r-- | app/views/shared/web_hooks/_index.html.haml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/wikis/_sidebar.html.haml b/app/views/projects/wikis/_sidebar.html.haml index 83d145444d8..0f2938686cc 100644 --- a/app/views/projects/wikis/_sidebar.html.haml +++ b/app/views/projects/wikis/_sidebar.html.haml @@ -17,5 +17,6 @@ %ul.wiki-pages = render @sidebar_wiki_entries, context: 'sidebar' .block.w-100 - = link_to project_wikis_pages_path(@project), class: 'btn btn-block' do - = s_("Wiki|More Pages") + - if @sidebar_wiki_entries&.length.to_i >= 15 + = link_to project_wikis_pages_path(@project), class: 'btn btn-block' do + = s_("Wiki|View All Pages") diff --git a/app/views/shared/web_hooks/_index.html.haml b/app/views/shared/web_hooks/_index.html.haml index b22d51a101a..149f4baeb21 100644 --- a/app/views/shared/web_hooks/_index.html.haml +++ b/app/views/shared/web_hooks/_index.html.haml @@ -3,7 +3,7 @@ .card-header %h5 = hook_class.underscore.humanize.titleize.pluralize - (#{hooks.count}) + (#{hooks.load.size}) - if hooks.any? %ul.content-list |