diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-04-05 13:28:19 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-04-05 13:28:19 +0300 |
| commit | 934dabaf6da42db7197e07dc95cf88d34e847306 (patch) | |
| tree | 537ca94aeaf22d8ddb411582b3f66c0cd9c6fad2 /app/controllers | |
| parent | 39eb16aab2dbac3347f61f83fb60f5448d44e965 (diff) | |
| parent | ea3831986b63b2e070d9b61c8e307488822acf28 (diff) | |
Merge branch 'keyval-labels' into 'master'
[CE] Add mutually exclusive labels
See merge request gitlab-org/gitlab-ce!26804
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index 8ef3b6502df..85aeecbf90b 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -7,6 +7,9 @@ module IssuableActions included do before_action :authorize_destroy_issuable!, only: :destroy before_action :authorize_admin_issuable!, only: :bulk_update + before_action only: :show do + push_frontend_feature_flag(:scoped_labels, default_enabled: true) + end end def permitted_keys |