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
3e75a3c8
Commit
3e75a3c8
authored
Jan 16, 2020
by
sstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rm FF for wrk in progress limits
parent
71f20670
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
11 deletions
+17
-11
ee/app/controllers/concerns/ee/boards_actions.rb
ee/app/controllers/concerns/ee/boards_actions.rb
+2
-1
ee/app/controllers/ee/boards/lists_controller.rb
ee/app/controllers/ee/boards/lists_controller.rb
+1
-1
ee/app/models/ee/list.rb
ee/app/models/ee/list.rb
+1
-1
ee/app/services/ee/boards/lists/create_service.rb
ee/app/services/ee/boards/lists/create_service.rb
+1
-1
ee/app/views/shared/boards/components/_board_settings_sidebar.html.haml
...hared/boards/components/_board_settings_sidebar.html.haml
+1
-1
ee/app/views/shared/boards/components/_list_settings.html.haml
...p/views/shared/boards/components/_list_settings.html.haml
+1
-1
ee/changelogs/unreleased/ss-wrk-in-prog-limit-default-on.yml
ee/changelogs/unreleased/ss-wrk-in-prog-limit-default-on.yml
+5
-0
ee/spec/features/boards/boards_spec.rb
ee/spec/features/boards/boards_spec.rb
+5
-5
No files found.
ee/app/controllers/concerns/ee/boards_actions.rb
View file @
3e75a3c8
...
@@ -11,7 +11,8 @@ module EE
...
@@ -11,7 +11,8 @@ module EE
private
private
def
push_wip_limits
def
push_wip_limits
push_frontend_feature_flag
(
:wip_limits
,
parent
)
if
parent
.
feature_available?
(
:wip_limits
)
# This is pushing a licensed Feature to the frontend.
push_frontend_feature_flag
(
:wip_limits
,
default_enabled:
true
)
if
parent
.
feature_available?
(
:wip_limits
)
end
end
end
end
end
end
ee/app/controllers/ee/boards/lists_controller.rb
View file @
3e75a3c8
...
@@ -36,7 +36,7 @@ module EE
...
@@ -36,7 +36,7 @@ module EE
private
private
def
wip_limits_available?
def
wip_limits_available?
board_parent
.
beta_
feature_available?
(
:wip_limits
)
board_parent
.
feature_available?
(
:wip_limits
)
end
end
end
end
end
end
...
...
ee/app/models/ee/list.rb
View file @
3e75a3c8
...
@@ -38,7 +38,7 @@ module EE
...
@@ -38,7 +38,7 @@ module EE
def
wip_limits_available?
def
wip_limits_available?
strong_memoize
(
:wip_limits_available
)
do
strong_memoize
(
:wip_limits_available
)
do
board
.
resource_parent
.
beta_
feature_available?
(
:wip_limits
)
board
.
resource_parent
.
feature_available?
(
:wip_limits
)
end
end
end
end
...
...
ee/app/services/ee/boards/lists/create_service.rb
View file @
3e75a3c8
...
@@ -69,7 +69,7 @@ module EE
...
@@ -69,7 +69,7 @@ module EE
end
end
def
wip_limits_available?
def
wip_limits_available?
parent
.
beta_
feature_available?
(
:wip_limits
)
parent
.
feature_available?
(
:wip_limits
)
end
end
end
end
end
end
...
...
ee/app/views/shared/boards/components/_board_settings_sidebar.html.haml
View file @
3e75a3c8
-
if
current_board_parent
.
beta_
feature_available?
(
:wip_limits
)
-
if
current_board_parent
.
feature_available?
(
:wip_limits
)
%board-settings-sidebar
%board-settings-sidebar
ee/app/views/shared/boards/components/_list_settings.html.haml
View file @
3e75a3c8
-
if
current_board_parent
.
beta_
feature_available?
(
:wip_limits
)
-
if
current_board_parent
.
feature_available?
(
:wip_limits
)
%gl-button
.no-drag.rounded-right
{
type:
"button"
,
%gl-button
.no-drag.rounded-right
{
type:
"button"
,
"@click"
=>
"openSidebarSettings"
,
"@click"
=>
"openSidebarSettings"
,
"v-if"
=>
"isSettingsShown"
,
"v-if"
=>
"isSettingsShown"
,
...
...
ee/changelogs/unreleased/ss-wrk-in-prog-limit-default-on.yml
0 → 100644
View file @
3e75a3c8
---
title
:
Add support for work in progress limits - Max issue count only
merge_request
:
author
:
type
:
added
ee/spec/features/boards/boards_spec.rb
View file @
3e75a3c8
...
@@ -194,13 +194,13 @@ describe 'issue boards', :js do
...
@@ -194,13 +194,13 @@ describe 'issue boards', :js do
login_as
(
user
)
login_as
(
user
)
end
end
context
'When
FF is turned on
'
do
context
'When
license is available
'
do
let!
(
:label
)
{
create
(
:label
,
project:
project
,
name:
'Brount'
)
}
let!
(
:label
)
{
create
(
:label
,
project:
project
,
name:
'Brount'
)
}
let!
(
:list
)
{
create
(
:list
,
board:
board
,
label:
label
,
position:
1
)
}
let!
(
:list
)
{
create
(
:list
,
board:
board
,
label:
label
,
position:
1
)
}
before
do
before
do
stub_
feature_flag
s
(
wip_limits:
true
)
stub_
licensed_feature
s
(
wip_limits:
true
)
visit
project_boards_path
(
project
)
visit
_board_page
end
end
it
'shows the list settings button'
do
it
'shows the list settings button'
do
...
@@ -277,9 +277,9 @@ describe 'issue boards', :js do
...
@@ -277,9 +277,9 @@ describe 'issue boards', :js do
end
end
end
end
context
'When
FF is turned off
'
do
context
'When
license is not available
'
do
before
do
before
do
stub_
feature_flag
s
(
wip_limits:
false
)
stub_
licensed_feature
s
(
wip_limits:
false
)
visit
project_boards_path
(
project
)
visit
project_boards_path
(
project
)
end
end
...
...
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