Merge branch 'hotfix/1.0.1' into develop

This commit is contained in:
Sojan
2020-01-09 12:01:07 +05:30
3 changed files with 4 additions and 1 deletions

View File

@@ -29,6 +29,8 @@ Rails/ApplicationController:
- 'app/controllers/widgets_controller.rb'
Style/ClassAndModuleChildren:
EnforcedStyle: compact
Exclude:
- 'config/application.rb'
RSpec/NestedGroups:
Enabled: true
Max: 4

View File

@@ -1,4 +1,5 @@
class Api::V1::Widget::MessagesController < ActionController::Base
skip_before_action :verify_authenticity_token
before_action :set_conversation, only: [:create]
def index

View File

@@ -11,7 +11,7 @@ Bundler.require(*Rails.groups)
module Chatwoot
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 5.0
config.load_defaults 6.0
config.autoload_paths << Rails.root.join('lib')
config.eager_load_paths << Rails.root.join('lib')