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
707e99a6
Commit
707e99a6
authored
Oct 07, 2020
by
Samantha Ming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Align badge with avatar in MR List
Issue:
https://gitlab.com/gitlab-org/gitlab/-/issues/259060
parent
803d87fe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-6
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
changelogs/unreleased/259060-align-badge-in-mr-list.yml
changelogs/unreleased/259060-align-badge-in-mr-list.yml
+5
-0
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
707e99a6
...
...
@@ -471,12 +471,6 @@ $mr-widget-min-height: 69px;
flex
:
1
;
}
.issuable-meta
{
.author-link
{
display
:
inline-block
;
}
}
.merge-request-title
{
margin-bottom
:
2px
;
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
707e99a6
...
...
@@ -53,7 +53,7 @@
=
link_to
merge_request_path
(
merge_request
),
class:
"has-tooltip"
,
title:
_
(
'Cannot be merged automatically'
)
do
=
sprite_icon
(
'warning-solid'
)
-
if
merge_request
.
assignees
.
any?
%li
.gl-display-flex
%li
.gl-display-flex
.gl-align-items-center
=
render
'shared/issuable/assignees'
,
project:
merge_request
.
project
,
issuable:
merge_request
-
if
Feature
.
enabled?
(
:merge_request_reviewers
,
@project
)
&&
merge_request
.
reviewers
.
any?
%li
.gl-display-flex.issuable-reviewers
...
...
changelogs/unreleased/259060-align-badge-in-mr-list.yml
0 → 100644
View file @
707e99a6
---
title
:
Align badge with avatar in MR List
merge_request
:
44671
author
:
type
:
fixed
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