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
8ca88a53
Commit
8ca88a53
authored
Jan 21, 2021
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added locked status to status box Vue component
parent
09210823
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
app/assets/javascripts/merge_request/components/status_box.vue
...ssets/javascripts/merge_request/components/status_box.vue
+2
-0
changelogs/unreleased/ph-mergeRequestLockedStatus.yml
changelogs/unreleased/ph-mergeRequestLockedStatus.yml
+5
-0
spec/frontend/merge_request/components/status_box_spec.js
spec/frontend/merge_request/components/status_box_spec.js
+6
-0
No files found.
app/assets/javascripts/merge_request/components/status_box.vue
View file @
8ca88a53
...
@@ -5,12 +5,14 @@ import mrEventHub from '../eventhub';
...
@@ -5,12 +5,14 @@ import mrEventHub from '../eventhub';
const
CLASSES
=
{
const
CLASSES
=
{
opened
:
'
status-box-open
'
,
opened
:
'
status-box-open
'
,
locked
:
'
status-box-open
'
,
closed
:
'
status-box-mr-closed
'
,
closed
:
'
status-box-mr-closed
'
,
merged
:
'
status-box-mr-merged
'
,
merged
:
'
status-box-mr-merged
'
,
};
};
const
STATUS
=
{
const
STATUS
=
{
opened
:
[
__
(
'
Open
'
),
'
issue-open-m
'
],
opened
:
[
__
(
'
Open
'
),
'
issue-open-m
'
],
locked
:
[
__
(
'
Open
'
),
'
issue-open-m
'
],
closed
:
[
__
(
'
Closed
'
),
'
close
'
],
closed
:
[
__
(
'
Closed
'
),
'
close
'
],
merged
:
[
__
(
'
Merged
'
),
'
git-merge
'
],
merged
:
[
__
(
'
Merged
'
),
'
git-merge
'
],
};
};
...
...
changelogs/unreleased/ph-mergeRequestLockedStatus.yml
0 → 100644
View file @
8ca88a53
---
title
:
Fixed merge requests locked status not showing
merge_request
:
52078
author
:
type
:
fixed
spec/frontend/merge_request/components/status_box_spec.js
View file @
8ca88a53
...
@@ -17,6 +17,12 @@ const testCases = [
...
@@ -17,6 +17,12 @@ const testCases = [
class
:
'
status-box-open
'
,
class
:
'
status-box-open
'
,
icon
:
'
issue-open-m
'
,
icon
:
'
issue-open-m
'
,
},
},
{
name
:
'
Open
'
,
state
:
'
locked
'
,
class
:
'
status-box-open
'
,
icon
:
'
issue-open-m
'
,
},
{
{
name
:
'
Closed
'
,
name
:
'
Closed
'
,
state
:
'
closed
'
,
state
:
'
closed
'
,
...
...
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