Merge branch 'develop' into feat/github-integration

app/models/category.rb

@@ -25,6 +25,7 @@
 #  index_categories_on_slug_and_locale_and_portal_id  (slug,locale,portal_id) UNIQUE
 #
 class Category < ApplicationRecord
+  paginates_per Limits::CATEGORIES_PER_PAGE
   belongs_to :account
   belongs_to :portal
   has_many :folders, dependent: :destroy_async

app/models/channel/twilio_sms.rb

@@ -2,16 +2,18 @@
 #
 # Table name: channel_twilio_sms
 #
-#  id                    :bigint           not null, primary key
-#  account_sid           :string           not null
-#  api_key_sid           :string
-#  auth_token            :string           not null
-#  medium                :integer          default("sms")
-#  messaging_service_sid :string
-#  phone_number          :string
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  account_id            :integer          not null
+#  id                             :bigint           not null, primary key
+#  account_sid                    :string           not null
+#  api_key_sid                    :string
+#  auth_token                     :string           not null
+#  content_templates              :jsonb
+#  content_templates_last_updated :datetime
+#  medium                         :integer          default("sms")
+#  messaging_service_sid          :string
+#  phone_number                   :string
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
+#  account_id                     :integer          not null
 #
 # Indexes
 #