Commit c3949598 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'ph/mergeRequestLockedStatus' into 'master'

Added locked status to status box Vue component

See merge request gitlab-org/gitlab!52078
parents 12853621 8ca88a53
......@@ -5,12 +5,14 @@ import mrEventHub from '../eventhub';
const CLASSES = {
opened: 'status-box-open',
locked: 'status-box-open',
closed: 'status-box-mr-closed',
merged: 'status-box-mr-merged',
};
const STATUS = {
opened: [__('Open'), 'issue-open-m'],
locked: [__('Open'), 'issue-open-m'],
closed: [__('Closed'), 'close'],
merged: [__('Merged'), 'git-merge'],
};
......
---
title: Fixed merge requests locked status not showing
merge_request: 52078
author:
type: fixed
......@@ -17,6 +17,12 @@ const testCases = [
class: 'status-box-open',
icon: 'issue-open-m',
},
{
name: 'Open',
state: 'locked',
class: 'status-box-open',
icon: 'issue-open-m',
},
{
name: 'Closed',
state: 'closed',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment