Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d321d229
Commit
d321d229
authored
Apr 25, 2019
by
Victor Wu
Committed by
Sean McGivern
Apr 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Externalize strings in merge request tabs
parent
1e2d4a21
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+4
-4
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/views/projects/merge_requests/show.html.haml
View file @
d321d229
...
@@ -37,21 +37,21 @@
...
@@ -37,21 +37,21 @@
%ul
.merge-request-tabs.nav-tabs.nav.nav-links.scrolling-tabs
%ul
.merge-request-tabs.nav-tabs.nav.nav-links.scrolling-tabs
%li
.notes-tab.qa-notes-tab
%li
.notes-tab.qa-notes-tab
=
tab_link_for
@merge_request
,
:show
,
force_link:
@commit
.
present?
do
=
tab_link_for
@merge_request
,
:show
,
force_link:
@commit
.
present?
do
Discussion
=
_
(
"Discussion"
)
%span
.badge.badge-pill
=
@merge_request
.
related_notes
.
user
.
count
%span
.badge.badge-pill
=
@merge_request
.
related_notes
.
user
.
count
-
if
@merge_request
.
source_project
-
if
@merge_request
.
source_project
%li
.commits-tab
%li
.commits-tab
=
tab_link_for
@merge_request
,
:commits
do
=
tab_link_for
@merge_request
,
:commits
do
Commits
=
_
(
"Commits"
)
%span
.badge.badge-pill
=
@commits_count
%span
.badge.badge-pill
=
@commits_count
-
if
@pipelines
.
any?
-
if
@pipelines
.
any?
%li
.pipelines-tab
%li
.pipelines-tab
=
tab_link_for
@merge_request
,
:pipelines
do
=
tab_link_for
@merge_request
,
:pipelines
do
Pipelines
=
_
(
"Pipelines"
)
%span
.badge.badge-pill.js-pipelines-mr-count
=
@pipelines
.
size
%span
.badge.badge-pill.js-pipelines-mr-count
=
@pipelines
.
size
%li
.diffs-tab.qa-diffs-tab
%li
.diffs-tab.qa-diffs-tab
=
tab_link_for
@merge_request
,
:diffs
do
=
tab_link_for
@merge_request
,
:diffs
do
Changes
=
_
(
"Changes"
)
%span
.badge.badge-pill
=
@merge_request
.
diff_size
%span
.badge.badge-pill
=
@merge_request
.
diff_size
.d-inline-flex.flex-wrap
.d-inline-flex.flex-wrap
#js-vue-discussion-filter
{
data:
{
default_filter:
current_user
&
.
notes_filter_for
(
@merge_request
),
#js-vue-discussion-filter
{
data:
{
default_filter:
current_user
&
.
notes_filter_for
(
@merge_request
),
...
...
locale/gitlab.pot
View file @
d321d229
...
@@ -3259,6 +3259,9 @@ msgstr ""
...
@@ -3259,6 +3259,9 @@ msgstr ""
msgid "Discuss a specific suggestion or question that needs to be resolved"
msgid "Discuss a specific suggestion or question that needs to be resolved"
msgstr ""
msgstr ""
msgid "Discussion"
msgstr ""
msgid "Dismiss"
msgid "Dismiss"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment