Merge branch 'patch-56' into 'master'
Externalize strings in merge request tabs See merge request gitlab-org/gitlab-ce!27653
This commit is contained in:
commit
93f4e5e8b3
|
@ -37,21 +37,21 @@
|
|||
%ul.merge-request-tabs.nav-tabs.nav.nav-links.scrolling-tabs
|
||||
%li.notes-tab.qa-notes-tab
|
||||
= tab_link_for @merge_request, :show, force_link: @commit.present? do
|
||||
Discussion
|
||||
= _("Discussion")
|
||||
%span.badge.badge-pill= @merge_request.related_notes.user.count
|
||||
- if @merge_request.source_project
|
||||
%li.commits-tab
|
||||
= tab_link_for @merge_request, :commits do
|
||||
Commits
|
||||
= _("Commits")
|
||||
%span.badge.badge-pill= @commits_count
|
||||
- if @pipelines.any?
|
||||
%li.pipelines-tab
|
||||
= tab_link_for @merge_request, :pipelines do
|
||||
Pipelines
|
||||
= _("Pipelines")
|
||||
%span.badge.badge-pill.js-pipelines-mr-count= @pipelines.size
|
||||
%li.diffs-tab.qa-diffs-tab
|
||||
= tab_link_for @merge_request, :diffs do
|
||||
Changes
|
||||
= _("Changes")
|
||||
%span.badge.badge-pill= @merge_request.diff_size
|
||||
.d-inline-flex.flex-wrap
|
||||
#js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@merge_request),
|
||||
|
|
|
@ -3259,6 +3259,9 @@ msgstr ""
|
|||
msgid "Discuss a specific suggestion or question that needs to be resolved"
|
||||
msgstr ""
|
||||
|
||||
msgid "Discussion"
|
||||
msgstr ""
|
||||
|
||||
msgid "Dismiss"
|
||||
msgstr ""
|
||||
|
||||
|
|
Loading…
Reference in New Issue