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
ecd5854d
Commit
ecd5854d
authored
Sep 04, 2020
by
Jarka Košanová
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add swimlanes to premium license
- renaame method pushing licensed features to boards FE
parent
682ec79a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
4 deletions
+13
-4
app/controllers/concerns/boards_actions.rb
app/controllers/concerns/boards_actions.rb
+2
-2
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/license.rb
ee/app/models/license.rb
+1
-0
ee/config/feature_flags/licensed/swimlanes.yml
ee/config/feature_flags/licensed/swimlanes.yml
+7
-0
No files found.
app/controllers/concerns/boards_actions.rb
View file @
ecd5854d
...
@@ -9,7 +9,7 @@ module BoardsActions
...
@@ -9,7 +9,7 @@ module BoardsActions
before_action
:boards
,
only: :index
before_action
:boards
,
only: :index
before_action
:board
,
only: :show
before_action
:board
,
only: :show
before_action
:push_
wip_limit
s
,
only:
[
:index
,
:show
]
before_action
:push_
licensed_feature
s
,
only:
[
:index
,
:show
]
before_action
do
before_action
do
push_frontend_feature_flag
(
:not_issuable_queries
,
parent
,
default_enabled:
true
)
push_frontend_feature_flag
(
:not_issuable_queries
,
parent
,
default_enabled:
true
)
end
end
...
@@ -29,7 +29,7 @@ module BoardsActions
...
@@ -29,7 +29,7 @@ module BoardsActions
private
private
# Noop on FOSS
# Noop on FOSS
def
push_
wip_limit
s
def
push_
licensed_feature
s
end
end
def
boards
def
boards
...
...
ee/app/controllers/concerns/ee/boards_actions.rb
View file @
ecd5854d
...
@@ -10,9 +10,10 @@ module EE
...
@@ -10,9 +10,10 @@ module EE
private
private
def
push_
wip_limit
s
def
push_
licensed_feature
s
# This is pushing a licensed Feature to the frontend.
# This is pushing a licensed Feature to the frontend.
push_frontend_feature_flag
(
:wip_limits
,
type: :licensed
,
default_enabled:
true
)
if
parent
.
feature_available?
(
:wip_limits
)
push_frontend_feature_flag
(
:wip_limits
,
type: :licensed
,
default_enabled:
true
)
if
parent
.
feature_available?
(
:wip_limits
)
push_frontend_feature_flag
(
:swimlanes
,
type: :licensed
,
default_enabled:
true
)
if
parent
.
feature_available?
(
:swimlanes
)
end
end
end
end
end
end
ee/app/controllers/ee/boards/lists_controller.rb
View file @
ecd5854d
...
@@ -6,7 +6,7 @@ module EE
...
@@ -6,7 +6,7 @@ module EE
extend
::
Gitlab
::
Utils
::
Override
extend
::
Gitlab
::
Utils
::
Override
included
do
included
do
before_action
:push_
wip_limit
s
before_action
:push_
licensed_feature
s
end
end
EE_MAX_LIMITS_PARAMS
=
%i[max_issue_count max_issue_weight limit_metric]
.
freeze
EE_MAX_LIMITS_PARAMS
=
%i[max_issue_count max_issue_weight limit_metric]
.
freeze
...
...
ee/app/models/license.rb
View file @
ecd5854d
...
@@ -108,6 +108,7 @@ class License < ApplicationRecord
...
@@ -108,6 +108,7 @@ class License < ApplicationRecord
required_ci_templates
required_ci_templates
scoped_labels
scoped_labels
smartcard_auth
smartcard_auth
swimlanes
group_timelogs
group_timelogs
type_of_work_analytics
type_of_work_analytics
minimal_access_role
minimal_access_role
...
...
ee/config/feature_flags/licensed/swimlanes.yml
0 → 100644
View file @
ecd5854d
---
name
:
swimlanes
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41543
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/239472
group
:
group::portfolio management
type
:
licensed
default_enabled
:
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