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
95a8f296
Commit
95a8f296
authored
Oct 28, 2020
by
sstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add WipLimit licensed check
parent
ba04974a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
3 deletions
+19
-3
app/assets/javascripts/boards/components/board_settings_sidebar.vue
.../javascripts/boards/components/board_settings_sidebar.vue
+7
-1
changelogs/unreleased/ss-add-wip-limits-license-check.yml
changelogs/unreleased/ss-add-wip-limits-license-check.yml
+5
-0
ee/spec/frontend/boards/components/board_settings_sidebar_spec.js
...frontend/boards/components/board_settings_sidebar_spec.js
+7
-2
No files found.
app/assets/javascripts/boards/components/board_settings_sidebar.vue
View file @
95a8f296
...
@@ -36,6 +36,9 @@ export default {
...
@@ -36,6 +36,9 @@ export default {
computed
:
{
computed
:
{
...
mapGetters
([
'
isSidebarOpen
'
,
'
shouldUseGraphQL
'
]),
...
mapGetters
([
'
isSidebarOpen
'
,
'
shouldUseGraphQL
'
]),
...
mapState
([
'
activeId
'
,
'
sidebarType
'
,
'
boardLists
'
]),
...
mapState
([
'
activeId
'
,
'
sidebarType
'
,
'
boardLists
'
]),
isWipLimitsOn
()
{
return
this
.
glFeatures
.
wipLimits
;
},
activeList
()
{
activeList
()
{
/*
/*
Warning: Though a computed property it is not reactive because we are
Warning: Though a computed property it is not reactive because we are
...
@@ -105,7 +108,10 @@ export default {
...
@@ -105,7 +108,10 @@ export default {
:active-list=
"activeList"
:active-list=
"activeList"
:board-list-type=
"boardListType"
:board-list-type=
"boardListType"
/>
/>
<board-settings-sidebar-wip-limit
:max-issue-count=
"activeList.maxIssueCount"
/>
<board-settings-sidebar-wip-limit
v-if=
"isWipLimitsOn"
:max-issue-count=
"activeList.maxIssueCount"
/>
<div
v-if=
"canAdminList && !activeList.preset && activeList.id"
class=
"gl-m-4"
>
<div
v-if=
"canAdminList && !activeList.preset && activeList.id"
class=
"gl-m-4"
>
<gl-button
<gl-button
variant=
"danger"
variant=
"danger"
...
...
changelogs/unreleased/ss-add-wip-limits-license-check.yml
0 → 100644
View file @
95a8f296
---
title
:
Add licensed check for wip limits
merge_request
:
46387
author
:
type
:
fixed
ee/spec/frontend/boards/components/board_settings_sidebar_spec.js
View file @
95a8f296
...
@@ -22,7 +22,7 @@ describe('ee/BoardSettingsSidebar', () => {
...
@@ -22,7 +22,7 @@ describe('ee/BoardSettingsSidebar', () => {
const
listId
=
1
;
const
listId
=
1
;
let
mock
;
let
mock
;
const
createComponent
=
(
actions
=
{})
=>
{
const
createComponent
=
(
actions
=
{}
,
isWipLimitsOn
=
false
)
=>
{
storeActions
=
actions
;
storeActions
=
actions
;
const
store
=
new
Vuex
.
Store
({
const
store
=
new
Vuex
.
Store
({
...
@@ -34,6 +34,11 @@ describe('ee/BoardSettingsSidebar', () => {
...
@@ -34,6 +34,11 @@ describe('ee/BoardSettingsSidebar', () => {
wrapper
=
shallowMount
(
BoardSettingsSidebar
,
{
wrapper
=
shallowMount
(
BoardSettingsSidebar
,
{
store
,
store
,
localVue
,
localVue
,
provide
:
{
glFeatures
:
{
wipLimits
:
isWipLimitsOn
,
},
},
stubs
:
{
stubs
:
{
'
board-settings-sidebar-wip-limit
'
:
BoardSettingsWipLimit
,
'
board-settings-sidebar-wip-limit
'
:
BoardSettingsWipLimit
,
'
board-settings-list-types
'
:
BoardSettingsListTypes
,
'
board-settings-list-types
'
:
BoardSettingsListTypes
,
...
@@ -59,7 +64,7 @@ describe('ee/BoardSettingsSidebar', () => {
...
@@ -59,7 +64,7 @@ describe('ee/BoardSettingsSidebar', () => {
list_type
:
'
label
'
,
list_type
:
'
label
'
,
});
});
createComponent
();
createComponent
(
{},
true
);
expect
(
wrapper
.
find
(
BoardSettingsWipLimit
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
BoardSettingsWipLimit
).
exists
()).
toBe
(
true
);
});
});
...
...
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