chore: Update dependencies (#1173)

This commit is contained in:
Sojan Jose
2020-09-08 11:24:08 +05:30
committed by GitHub
parent 3ffb29bf4e
commit ac5d755545
33 changed files with 134 additions and 150 deletions

View File

@@ -41,9 +41,10 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
end
def toggle_typing_status
if params[:typing_status] == 'on'
case params[:typing_status]
when 'on'
trigger_typing_event(CONVERSATION_TYPING_ON)
elsif params[:typing_status] == 'off'
when 'off'
trigger_typing_event(CONVERSATION_TYPING_OFF)
end
head :ok

View File

@@ -12,7 +12,7 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
end
def show
@agents = Current.account.users.where(id: @inbox.members.pluck(:user_id))
@agents = Current.account.users.where(id: @inbox.members.select(:user_id))
end
private

View File

@@ -91,7 +91,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
:welcome_tagline,
:webhook_url,
:email,
selected_feature_flags: []
{ selected_feature_flags: [] }
])
end
end

View File

@@ -26,9 +26,10 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
def toggle_typing
head :ok && return if conversation.nil?
if permitted_params[:typing_status] == 'on'
case permitted_params[:typing_status]
when 'on'
trigger_typing_event(CONVERSATION_TYPING_ON)
elsif permitted_params[:typing_status] == 'off'
when 'off'
trigger_typing_event(CONVERSATION_TYPING_OFF)
end

View File

@@ -112,7 +112,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
end
def message_update_params
params.permit(message: [submitted_values: [:name, :title, :value]])
params.permit(message: [{ submitted_values: [:name, :title, :value] }])
end
def permitted_params

View File

@@ -25,6 +25,6 @@ class DeviseOverrides::ConfirmationsController < Devise::ConfirmationsController
user.reset_password_token = enc
user.reset_password_sent_at = Time.now.utc
user.save(validate: false)
'/app/auth/password/edit?config=default&redirect_url=&reset_password_token=' + raw
"/app/auth/password/edit?config=default&redirect_url=&reset_password_token=#{raw}"
end
end

View File

@@ -27,7 +27,7 @@ class Twitter::CallbacksController < Twitter::BaseController
end
def account
@account ||= Account.find_by!(id: account_id)
@account ||= Account.find(account_id)
end
def twitter_app_redirect_url