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
e751e767
Commit
e751e767
authored
Apr 07, 2021
by
Scott Hampton
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'master'
Updated closed icon MR See merge request gitlab-org/gitlab!57981
parents
189d4dba
e1f8d19b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/merge_request/components/status_box.vue
...ssets/javascripts/merge_request/components/status_box.vue
+1
-1
changelogs/unreleased/changelog.yml
changelogs/unreleased/changelog.yml
+5
-0
spec/frontend/merge_request/components/status_box_spec.js
spec/frontend/merge_request/components/status_box_spec.js
+1
-1
No files found.
app/assets/javascripts/merge_request/components/status_box.vue
View file @
e751e767
...
...
@@ -13,7 +13,7 @@ const CLASSES = {
const
STATUS
=
{
opened
:
[
__
(
'
Open
'
),
'
issue-open-m
'
],
locked
:
[
__
(
'
Open
'
),
'
issue-open-m
'
],
closed
:
[
__
(
'
Closed
'
),
'
close
'
],
closed
:
[
__
(
'
Closed
'
),
'
issue-
close
'
],
merged
:
[
__
(
'
Merged
'
),
'
git-merge
'
],
};
...
...
changelogs/unreleased/changelog.yml
0 → 100644
View file @
e751e767
---
title
:
Fix closed icon for merge requests to match close issue icon
merge_request
:
57981
author
:
jesus beltran
type
:
fixed
spec/frontend/merge_request/components/status_box_spec.js
View file @
e751e767
...
...
@@ -27,7 +27,7 @@ const testCases = [
name
:
'
Closed
'
,
state
:
'
closed
'
,
class
:
'
status-box-mr-closed
'
,
icon
:
'
close
'
,
icon
:
'
issue-
close
'
,
},
{
name
:
'
Merged
'
,
...
...
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