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
e5d47be1
Commit
e5d47be1
authored
Apr 26, 2021
by
Yogi
Committed by
Scott Hampton
Apr 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gl-badge for badges in new MR nav
Use gl-badge classes for the badges in HAML
parent
9d9b902a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/projects/merge_requests/creations/_new_submit.html.haml
...s/projects/merge_requests/creations/_new_submit.html.haml
+3
-3
changelogs/unreleased/gl-badge-new-mr.yml
changelogs/unreleased/gl-badge-new-mr.yml
+5
-0
No files found.
app/views/projects/merge_requests/creations/_new_submit.html.haml
View file @
e5d47be1
...
@@ -26,16 +26,16 @@
...
@@ -26,16 +26,16 @@
%li
.commits-tab.new-tab
%li
.commits-tab.new-tab
=
link_to
url_for
(
safe_params
),
data:
{
target:
'div#commits'
,
action:
'new'
,
toggle:
'tabvue'
}
do
=
link_to
url_for
(
safe_params
),
data:
{
target:
'div#commits'
,
action:
'new'
,
toggle:
'tabvue'
}
do
Commits
Commits
%span
.badge.
badge-pill
=
@total_commit_count
%span
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
@total_commit_count
-
if
@pipelines
.
any?
-
if
@pipelines
.
any?
%li
.builds-tab
%li
.builds-tab
=
link_to
url_for
(
safe_params
.
merge
(
action:
'pipelines'
)),
data:
{
target:
'div#pipelines'
,
action:
'pipelines'
,
toggle:
'tabvue'
}
do
=
link_to
url_for
(
safe_params
.
merge
(
action:
'pipelines'
)),
data:
{
target:
'div#pipelines'
,
action:
'pipelines'
,
toggle:
'tabvue'
}
do
Pipelines
Pipelines
%span
.badge.
badge-pill
=
@pipelines
.
size
%span
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
@pipelines
.
size
%li
.diffs-tab
%li
.diffs-tab
=
link_to
url_for
(
safe_params
.
merge
(
action:
'diffs'
)),
data:
{
target:
'div#diffs'
,
action:
'diffs'
,
toggle:
'tabvue'
,
qa_selector:
'diffs_tab'
}
do
=
link_to
url_for
(
safe_params
.
merge
(
action:
'diffs'
)),
data:
{
target:
'div#diffs'
,
action:
'diffs'
,
toggle:
'tabvue'
,
qa_selector:
'diffs_tab'
}
do
Changes
Changes
%span
.badge.
badge-pill
=
@merge_request
.
diff_size
%span
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
@merge_request
.
diff_size
#diff-notes-app
.tab-content
#diff-notes-app
.tab-content
#new
.commits.tab-pane.active
#new
.commits.tab-pane.active
...
...
changelogs/unreleased/gl-badge-new-mr.yml
0 → 100644
View file @
e5d47be1
---
title
:
Add gl-badge for badges in new MR nav
merge_request
:
57995
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