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

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2016-09-01 14:39:44 +02:00
commit cd82f7b406
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/deploy.rb
View file

@ -68,6 +68,7 @@ set :shared_paths, [
'config/initializers/features.yml', 'config/initializers/features.yml',
"config/environments/#{ENV['to']}.rb", "config/environments/#{ENV['to']}.rb",
"config/initializers/token.rb", "config/initializers/token.rb",
"config/initializers/urls.rb",
"config/initializers/super_admin.rb", "config/initializers/super_admin.rb",
"config/unicorn.rb", "config/unicorn.rb",
"config/initializers/raven.rb", "config/initializers/raven.rb",

5
config/initializers/urls.rb Normal file
View file

@ -0,0 +1,5 @@
if Rails.env.production?
SIADEURL = 'https://api.apientreprise.fr'
else
SIADEURL = 'https://api-dev.apientreprise.fr'
end

6
lib/siade/api.rb
View file

@ -38,10 +38,6 @@ class SIADE::API
end end
def self.base_url def self.base_url
if Rails.env.production? SIADEURL
'https://api.apientreprise.fr'
else
'https://api-dev.apientreprise.fr'
end
end end
end end