Enable Style/TrailingCommaInHashLiteral
This commit is contained in:
parent
2ede598f77
commit
a171186dd8
17 changed files with 18 additions and 18 deletions
|
@ -1226,7 +1226,7 @@ Style/TrailingCommaInArrayLiteral:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
||||||
Style/TrailingCommaInHashLiteral:
|
Style/TrailingCommaInHashLiteral:
|
||||||
Enabled: false
|
Enabled: true
|
||||||
|
|
||||||
Style/TrailingMethodEndStatement:
|
Style/TrailingMethodEndStatement:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
|
@ -35,7 +35,7 @@ class Admin::MailTemplatesController < AdminController
|
||||||
{
|
{
|
||||||
procedure_id: params[:procedure_id],
|
procedure_id: params[:procedure_id],
|
||||||
subject: params[:mail_template][:subject],
|
subject: params[:mail_template][:subject],
|
||||||
body: params[:mail_template][:body],
|
body: params[:mail_template][:body]
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -123,7 +123,7 @@ class ApplicationController < ActionController::Base
|
||||||
payload.merge!({
|
payload.merge!({
|
||||||
browser: browser.name,
|
browser: browser.name,
|
||||||
browser_version: browser.version.to_s,
|
browser_version: browser.version.to_s,
|
||||||
platform: browser.platform.name,
|
platform: browser.platform.name
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ module Manager
|
||||||
redirect_to manager_administrateurs_path
|
redirect_to manager_administrateurs_path
|
||||||
else
|
else
|
||||||
render :new, locals: {
|
render :new, locals: {
|
||||||
page: Administrate::Page::Form.new(dashboard, administrateur),
|
page: Administrate::Page::Form.new(dashboard, administrateur)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -15,7 +15,7 @@ class DossierDashboard < Administrate::BaseDashboard
|
||||||
created_at: Field::DateTime,
|
created_at: Field::DateTime,
|
||||||
updated_at: Field::DateTime,
|
updated_at: Field::DateTime,
|
||||||
hidden_at: Field::DateTime,
|
hidden_at: Field::DateTime,
|
||||||
types_de_champ: TypesDeChampCollectionField,
|
types_de_champ: TypesDeChampCollectionField
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
# COLLECTION_ATTRIBUTES
|
# COLLECTION_ATTRIBUTES
|
||||||
|
|
|
@ -33,7 +33,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
|
||||||
received_mail_template: MailTemplateField,
|
received_mail_template: MailTemplateField,
|
||||||
closed_mail_template: MailTemplateField,
|
closed_mail_template: MailTemplateField,
|
||||||
refused_mail_template: MailTemplateField,
|
refused_mail_template: MailTemplateField,
|
||||||
without_continuation_mail_template: MailTemplateField,
|
without_continuation_mail_template: MailTemplateField
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
# COLLECTION_ATTRIBUTES
|
# COLLECTION_ATTRIBUTES
|
||||||
|
|
|
@ -19,7 +19,7 @@ class ServiceDashboard < Administrate::BaseDashboard
|
||||||
telephone: Field::String,
|
telephone: Field::String,
|
||||||
horaires: Field::String,
|
horaires: Field::String,
|
||||||
adresse: Field::String,
|
adresse: Field::String,
|
||||||
siret: Field::String,
|
siret: Field::String
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
# COLLECTION_ATTRIBUTES
|
# COLLECTION_ATTRIBUTES
|
||||||
|
|
|
@ -14,7 +14,7 @@ class UserDashboard < Administrate::BaseDashboard
|
||||||
created_at: Field::DateTime,
|
created_at: Field::DateTime,
|
||||||
updated_at: Field::DateTime,
|
updated_at: Field::DateTime,
|
||||||
current_sign_in_at: Field::DateTime,
|
current_sign_in_at: Field::DateTime,
|
||||||
dossiers: Field::HasMany,
|
dossiers: Field::HasMany
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
# COLLECTION_ATTRIBUTES
|
# COLLECTION_ATTRIBUTES
|
||||||
|
|
|
@ -55,7 +55,7 @@ class Pipedrive::DealAdapter
|
||||||
user_id: Pipedrive::PersonAdapter::PIPEDRIVE_ROBOT_ID,
|
user_id: Pipedrive::PersonAdapter::PIPEDRIVE_ROBOT_ID,
|
||||||
"#{PIPEDRIVE_NB_OF_PROCEDURES_ATTRIBUTE_ID}": nb_of_procedures,
|
"#{PIPEDRIVE_NB_OF_PROCEDURES_ATTRIBUTE_ID}": nb_of_procedures,
|
||||||
value: nb_of_dossiers,
|
value: nb_of_dossiers,
|
||||||
"#{PIPEDRIVE_DEADLINE_ATTRIBUTE_ID}": deadline,
|
"#{PIPEDRIVE_DEADLINE_ATTRIBUTE_ID}": deadline
|
||||||
}
|
}
|
||||||
|
|
||||||
Pipedrive::API.post_deal(params)
|
Pipedrive::API.post_deal(params)
|
||||||
|
|
|
@ -76,7 +76,7 @@ class Gestionnaire < ApplicationRecord
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
start_date: start_date,
|
start_date: start_date,
|
||||||
procedure_overviews: active_procedure_overviews,
|
procedure_overviews: active_procedure_overviews
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,7 +4,7 @@ class VirusScan < ApplicationRecord
|
||||||
enum status: {
|
enum status: {
|
||||||
pending: 'pending',
|
pending: 'pending',
|
||||||
safe: 'safe',
|
safe: 'safe',
|
||||||
infected: 'infected',
|
infected: 'infected'
|
||||||
}
|
}
|
||||||
|
|
||||||
validates :champ_id, uniqueness: { scope: :blob_key }
|
validates :champ_id, uniqueness: { scope: :blob_key }
|
||||||
|
|
|
@ -50,7 +50,7 @@ class ActiveJobLogSubscriber < ::ActiveJob::Logging::LogSubscriber
|
||||||
job_id: event.payload[:job].job_id,
|
job_id: event.payload[:job].job_id,
|
||||||
queue_name: queue_name(event),
|
queue_name: queue_name(event),
|
||||||
job_class: event.payload[:job].class.to_s,
|
job_class: event.payload[:job].class.to_s,
|
||||||
job_args: args_info(event.payload[:job]),
|
job_args: args_info(event.payload[:job])
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ CarrierWave.configure do |config|
|
||||||
openstack_api_key: Rails.application.secrets.fog[:openstack_api_key],
|
openstack_api_key: Rails.application.secrets.fog[:openstack_api_key],
|
||||||
openstack_username: Rails.application.secrets.fog[:openstack_username],
|
openstack_username: Rails.application.secrets.fog[:openstack_username],
|
||||||
openstack_auth_url: Rails.application.secrets.fog[:openstack_auth_url],
|
openstack_auth_url: Rails.application.secrets.fog[:openstack_auth_url],
|
||||||
openstack_region: Rails.application.secrets.fog[:openstack_region],
|
openstack_region: Rails.application.secrets.fog[:openstack_region]
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ class BuildDefaultPreferenceListDossier < ActiveRecord::Migration
|
||||||
nom_commercial: create_column('Nom commercial', table, 'nom_commercial', 'nom_commercial', 3),
|
nom_commercial: create_column('Nom commercial', table, 'nom_commercial', 'nom_commercial', 3),
|
||||||
raison_sociale: create_column('Raison sociale', table, 'raison_sociale', 'raison_sociale', 3),
|
raison_sociale: create_column('Raison sociale', table, 'raison_sociale', 'raison_sociale', 3),
|
||||||
siret_siege_social: create_column('SIRET siège social', table, 'siret_siege_social', 'siret_siege_social', 2),
|
siret_siege_social: create_column('SIRET siège social', table, 'siret_siege_social', 'siret_siege_social', 2),
|
||||||
date_creation: create_column('Date de création', table, 'date_creation', 'date_creation', 2),
|
date_creation: create_column('Date de création', table, 'date_creation', 'date_creation', 2)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ class ResetAllPreferenceListDossier < ActiveRecord::Migration
|
||||||
nom_commercial: create_column('Nom commercial', table, 'nom_commercial', 'nom_commercial', 3),
|
nom_commercial: create_column('Nom commercial', table, 'nom_commercial', 'nom_commercial', 3),
|
||||||
raison_sociale: create_column('Raison sociale', table, 'raison_sociale', 'raison_sociale', 3),
|
raison_sociale: create_column('Raison sociale', table, 'raison_sociale', 'raison_sociale', 3),
|
||||||
siret_siege_social: create_column('SIRET siège social', table, 'siret_siege_social', 'siret_siege_social', 2),
|
siret_siege_social: create_column('SIRET siège social', table, 'siret_siege_social', 'siret_siege_social', 2),
|
||||||
date_creation: create_column('Date de création', table, 'date_creation', 'date_creation', 2),
|
date_creation: create_column('Date de création', table, 'date_creation', 'date_creation', 2)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@ describe Users::PasswordsController, type: :controller do
|
||||||
user: {
|
user: {
|
||||||
reset_password_token: @token,
|
reset_password_token: @token,
|
||||||
password: "mot de passe super secret",
|
password: "mot de passe super secret",
|
||||||
password_confirmation: "mot de passe super secret",
|
password_confirmation: "mot de passe super secret"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
expect(subject.current_user).to eq(user)
|
expect(subject.current_user).to eq(user)
|
||||||
|
@ -34,7 +34,7 @@ describe Users::PasswordsController, type: :controller do
|
||||||
user: {
|
user: {
|
||||||
reset_password_token: @token,
|
reset_password_token: @token,
|
||||||
password: "mot de passe super secret",
|
password: "mot de passe super secret",
|
||||||
password_confirmation: "mot de passe super secret",
|
password_confirmation: "mot de passe super secret"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
expect(subject.current_user).to eq(user)
|
expect(subject.current_user).to eq(user)
|
||||||
|
|
|
@ -47,7 +47,7 @@ describe 'CellarService' do
|
||||||
'Expires' => ['1475366700'],
|
'Expires' => ['1475366700'],
|
||||||
'Signature' => ['nzCsB6cip8oofkuOdvvJs6FafkA='],
|
'Signature' => ['nzCsB6cip8oofkuOdvvJs6FafkA='],
|
||||||
'response-content-disposition' => ["attachment; filename=\"toto.png\"; filename*=UTF-8''toto.png"],
|
'response-content-disposition' => ["attachment; filename=\"toto.png\"; filename*=UTF-8''toto.png"],
|
||||||
'response-content-type' => ['image/png'],
|
'response-content-type' => ['image/png']
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue