diff options
author | Winnie Hellmann <winnie@gitlab.com> | 2019-02-26 22:14:03 +0100 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2019-03-06 13:18:19 +0100 |
commit | d5aa36f1e0ea9f8253e817ee015a5b1aaa7afb61 (patch) | |
tree | 6a0cce0a8a9400f8216e5cf980ca1a10fc12f527 /app | |
parent | c9e5ce8dbd25203484b43c48f0a55a5d7bf396e8 (diff) | |
download | gitlab-ce-d5aa36f1e0ea9f8253e817ee015a5b1aaa7afb61.tar.gz |
Enable reply_to_individual_notes feature flag by default
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 2 | ||||
-rw-r--r-- | app/models/individual_note_discussion.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index cd3fa641e89..05d88429cfe 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -8,7 +8,7 @@ module IssuableActions before_action :authorize_destroy_issuable!, only: :destroy before_action :authorize_admin_issuable!, only: :bulk_update before_action only: :show do - push_frontend_feature_flag(:reply_to_individual_notes) + push_frontend_feature_flag(:reply_to_individual_notes, default_enabled: true) end end diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb index b4a661ae5b4..3b6b68a9c5f 100644 --- a/app/models/individual_note_discussion.rb +++ b/app/models/individual_note_discussion.rb @@ -14,7 +14,7 @@ class IndividualNoteDiscussion < Discussion end def can_convert_to_discussion? - noteable.supports_replying_to_individual_notes? && Feature.enabled?(:reply_to_individual_notes) + noteable.supports_replying_to_individual_notes? && Feature.enabled?(:reply_to_individual_notes, default_enabled: true) end def convert_to_discussion!(save: false) |