Commit ea53ec11 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'bw-fix-epic-trees-feature-flag' into 'master'

Scope the :epic_trees feature flag to a group

See merge request gitlab-org/gitlab-ee!14618
parents bbaba3d1 40eb82f1
...@@ -15,7 +15,7 @@ class Groups::EpicsController < Groups::ApplicationController ...@@ -15,7 +15,7 @@ class Groups::EpicsController < Groups::ApplicationController
before_action :authorize_create_epic!, only: [:create] before_action :authorize_create_epic!, only: [:create]
before_action do before_action do
push_frontend_feature_flag(:epic_trees) push_frontend_feature_flag(:epic_trees, @group)
end end
def index def index
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%a#discussion-tab.active{ href: '#discussion', data: { toggle: 'tab' } } %a#discussion-tab.active{ href: '#discussion', data: { toggle: 'tab' } }
= _('Discussion') = _('Discussion')
%span.badge.badge-pill= @epic.notes.user.count %span.badge.badge-pill= @epic.notes.user.count
- if Feature.enabled?(:epic_trees) - if Feature.enabled?(:epic_trees, @group)
%li.tree-tab %li.tree-tab
%a#tree-tab{ href: '#tree', data: { toggle: 'tab' } } %a#tree-tab{ href: '#tree', data: { toggle: 'tab' } }
= _('Tree') = _('Tree')
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
%script.js-notes-data{ type: "application/json" }= initial_notes_data(true).to_json.html_safe %script.js-notes-data{ type: "application/json" }= initial_notes_data(true).to_json.html_safe
.issuable-discussion .issuable-discussion
= render 'discussion' = render 'discussion'
- if Feature.enabled?(:epic_trees) - if Feature.enabled?(:epic_trees, @group)
#tree.tab-pane #tree.tab-pane
.row .row
%section.col-md-12 %section.col-md-12
......
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