DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Enable Style/SymbolArray

Browse source
This commit is contained in:
gregoirenovel 2018-10-01 14:26:45 +02:00
parent 2004b9a864
commit c91a1cf474
7 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.rubocop.yml
View file

@ -1199,7 +1199,8 @@ Style/StructInheritance:
Enabled: false Enabled: false
Style/SymbolArray: Style/SymbolArray:
Enabled: false Enabled: true
EnforcedStyle: brackets
Style/SymbolLiteral: Style/SymbolLiteral:
Enabled: true Enabled: true

2
app/controllers/application_controller.rb
View file

@ -143,7 +143,7 @@ class ApplicationController < ActionController::Base
elsif api_request elsif api_request
render json: { error: MAINTENANCE_MESSAGE }.to_json, status: :service_unavailable render json: { error: MAINTENANCE_MESSAGE }.to_json, status: :service_unavailable
else else
%i(user gestionnaire administrateur).each { |role| sign_out(role) } [:user, :gestionnaire, :administrateur].each { |role| sign_out(role) }
flash[:alert] = MAINTENANCE_MESSAGE flash[:alert] = MAINTENANCE_MESSAGE
redirect_to root_path redirect_to root_path
end end

4
app/controllers/gestionnaires/passwords_controller.rb
View file

@ -1,6 +1,6 @@
class Gestionnaires::PasswordsController < Devise::PasswordsController class Gestionnaires::PasswordsController < Devise::PasswordsController
after_action :try_to_authenticate_user, only: %i(update) after_action :try_to_authenticate_user, only: [:update]
after_action :try_to_authenticate_administrateur, only: %i(update) after_action :try_to_authenticate_administrateur, only: [:update]
# GET /resource/password/new # GET /resource/password/new
# def new # def new

4
app/controllers/users/passwords_controller.rb
View file

@ -1,6 +1,6 @@
class Users::PasswordsController < Devise::PasswordsController class Users::PasswordsController < Devise::PasswordsController
after_action :try_to_authenticate_gestionnaire, only: %i(update) after_action :try_to_authenticate_gestionnaire, only: [:update]
after_action :try_to_authenticate_administrateur, only: %i(update) after_action :try_to_authenticate_administrateur, only: [:update]
# GET /resource/password/new # GET /resource/password/new
# def new # def new

2
app/models/attestation_template.rb
View file

@ -61,7 +61,7 @@ class AttestationTemplate < ApplicationRecord
end end
def logo_signature_file_size def logo_signature_file_size
%i[logo signature] [:logo, :signature]
.select { |file_name| send(file_name).present? } .select { |file_name| send(file_name).present? }
.each { |file_name| file_size_check(file_name) } .each { |file_name| file_size_check(file_name) }
end end

2
app/models/procedure.rb
View file

@ -224,7 +224,7 @@ class Procedure < ApplicationRecord
procedure.logo_secure_token = nil procedure.logo_secure_token = nil
procedure.remote_logo_url = self.logo_url procedure.remote_logo_url = self.logo_url
%i(notice deliberation).each { |attachment| clone_attachment(procedure, attachment) } [:notice, :deliberation].each { |attachment| clone_attachment(procedure, attachment) }
procedure.administrateur = admin procedure.administrateur = admin
procedure.initiated_mail = initiated_mail&.dup procedure.initiated_mail = initiated_mail&.dup

2
lib/tasks/2017_12_04_translate_dossier_state_to_french.rake
View file

@ -23,7 +23,7 @@ namespace :'2017_12_04_translate_dossier_state_to_french' do
Dossier.unscoped.where(state: 'without_continuation').update_all(state: 'sans_suite') Dossier.unscoped.where(state: 'without_continuation').update_all(state: 'sans_suite')
end end
task all: %i(brouillon en_construction en_instruction accepte refuse sans_suite) do task all: [:brouillon, :en_construction, :en_instruction, :accepte, :refuse, :sans_suite] do
end end
task revert: :environment do task revert: :environment do