Merge branch 'batch-comments-per-project-license-check' into 'master'

Use project-level license check for Batch Comments

See merge request gitlab-org/gitlab-ee!7838

ee/app/controllers/projects/merge_requests/drafts_controller.rb

@@ -107,8 +107,7 @@ class Projects::MergeRequests::DraftsController < Projects::MergeRequests::Appli
   end
 
   def draft_notes_available?
-    @project.feature_available?(:batch_comments) &&
-      ::Feature.enabled?(:batch_comments, current_user, default_enabled: false)
+    @project.feature_available?(:batch_comments, current_user)
   end
 
   def authorize_admin_draft!

ee/app/helpers/batch_comments_helper.rb

 module BatchCommentsHelper
   def batch_comments_enabled?
-    current_user.present? && License.feature_available?(:batch_comments) && Feature.enabled?(:batch_comments, current_user, default_enabled: false)
+    current_user.present? && @project.feature_available?(:batch_comments, current_user)
   end
 end