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

Merge pull request #5931 from betagouv/app-name-initializer

Browse source 
Nettoyage : déplacement de la configuration du nom de l'app dans un initialiseur (#5931)
This commit is contained in:
Pierre de La Morinerie 2021-02-24 15:47:59 +01:00 committed by GitHub
commit 4c66d2d206
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -20,7 +20,7 @@ DS/Unscoped:
DS/ApplicationName: DS/ApplicationName:
Enabled: true Enabled: true
Exclude: Exclude:
- './config/application_name.rb' - './config/initializers/01_application_name.rb'
- './lib/cops/application_name.rb' - './lib/cops/application_name.rb'
- './lib/linters/application_name_linter.rb' - './lib/linters/application_name_linter.rb'
- "./spec/**/*" - "./spec/**/*"

1
config/application.rb
View file

@ -7,7 +7,6 @@ require 'rails/all'
Bundler.require(*Rails.groups) Bundler.require(*Rails.groups)
Dotenv::Railtie.load Dotenv::Railtie.load
require_relative 'application_name'
module TPS module TPS
class Application < Rails::Application class Application < Rails::Application

3
config/application_name.rb → config/initializers/01_application_name.rb
View file

@ -1,3 +1,6 @@
# This file is named '01-application-name.rb' to load it before the other
# initializers, and thus make the APPLICATION_ constants available in
# the other initializers.
APPLICATION_NAME = ENV.fetch("APPLICATION_NAME", "demarches-simplifiees.fr") APPLICATION_NAME = ENV.fetch("APPLICATION_NAME", "demarches-simplifiees.fr")
APPLICATION_SHORTNAME = ENV.fetch("APPLICATION_SHORTNAME", "d-s.fr") APPLICATION_SHORTNAME = ENV.fetch("APPLICATION_SHORTNAME", "d-s.fr")
APPLICATION_BASE_URL = ENV.fetch("APPLICATION_BASE_URL", "https://www.demarches-simplifiees.fr") APPLICATION_BASE_URL = ENV.fetch("APPLICATION_BASE_URL", "https://www.demarches-simplifiees.fr")