diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-25 15:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-25 15:09:19 +0300 |
| commit | a156fc95eb8499fec9cd081d30629f0faf18bfe9 (patch) | |
| tree | ff59d44794ba9d8084e4d59057ec9507b3ba8e2f /app/views | |
| parent | 618be8f52d6349533c709a1d702e45b84338c36a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/issues/index.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 4c331dbd69d..0e06accf2d1 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -346,12 +346,12 @@ .nav-icon-container = sprite_icon('external-link') %span.nav-item-name - = _('External Wiki') + = s_('ExternalWikiService|External wiki') %ul.sidebar-sub-level-items.is-fly-out-only = nav_link(html_options: { class: "fly-out-top-item" } ) do = link_to external_wiki_url do %strong.fly-out-top-item-name - = _('External Wiki') + = s_('ExternalWikiService|External wiki') - if project_nav_tab? :snippets = nav_link(controller: :snippets) do diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 9c54b117f4c..3b35bd7544a 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -26,6 +26,8 @@ has_issuable_health_status_feature: Gitlab.ee? && @project.feature_available?(:issuable_health_status).to_s, has_issue_weights_feature: Gitlab.ee? && @project.feature_available?(:issue_weights).to_s, issues_path: project_issues_path(@project) } } + - if @can_bulk_update + = render 'shared/issuable/bulk_update_sidebar', type: :issues - else = render 'shared/issuable/search_bar', type: :issues |