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
f60c9011
Commit
f60c9011
authored
Apr 19, 2021
by
Yogi
Committed by
David O'Regan
Apr 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gl-badge for badges in MR page nav
parent
762e049d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+4
-4
changelogs/unreleased/gl-badge-mr-nav.yml
changelogs/unreleased/gl-badge-mr-nav.yml
+5
-0
No files found.
app/views/projects/merge_requests/show.html.haml
View file @
f60c9011
...
...
@@ -26,21 +26,21 @@
=
render
"projects/merge_requests/tabs/tab"
,
class:
"notes-tab"
,
qa_selector:
"notes_tab"
do
=
tab_link_for
@merge_request
,
:show
,
force_link:
@commit
.
present?
do
=
_
(
"Overview"
)
%span
.badge.badge-pill
=
@merge_request
.
related_notes
.
user
.
count
%span
.badge.badge-pill
.gl-badge.badge-muted.sm
=
@merge_request
.
related_notes
.
user
.
count
-
if
@merge_request
.
source_project
=
render
"projects/merge_requests/tabs/tab"
,
name:
"commits"
,
class:
"commits-tab"
do
=
tab_link_for
@merge_request
,
:commits
do
=
_
(
"Commits"
)
%span
.badge.badge-pill
=
@commits_count
%span
.badge.badge-pill
.gl-badge.badge-muted.sm
=
@commits_count
-
if
number_of_pipelines
.
nonzero?
=
render
"projects/merge_requests/tabs/tab"
,
name:
"pipelines"
,
class:
"pipelines-tab"
do
=
tab_link_for
@merge_request
,
:pipelines
do
=
_
(
"Pipelines"
)
%span
.badge.badge-pill.js-pipelines-mr-count
=
number_of_pipelines
%span
.badge.badge-pill.
gl-badge.badge-muted.sm.
js-pipelines-mr-count
=
number_of_pipelines
=
render
"projects/merge_requests/tabs/tab"
,
name:
"diffs"
,
class:
"diffs-tab"
,
id:
"diffs-tab"
,
qa_selector:
"diffs_tab"
do
=
tab_link_for
@merge_request
,
:diffs
do
=
_
(
"Changes"
)
%span
.badge.badge-pill
=
@merge_request
.
diff_size
%span
.badge.badge-pill
.gl-badge.badge-muted.sm
=
@merge_request
.
diff_size
.d-flex.flex-wrap.align-items-center.justify-content-lg-end
#js-vue-discussion-counter
...
...
changelogs/unreleased/gl-badge-mr-nav.yml
0 → 100644
View file @
f60c9011
---
title
:
Add gl-badge for badges in MR page nav
merge_request
:
57969
author
:
Yogi (@yo)
type
:
changed
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